1
0
mirror of https://github.com/rkd77/elinks.git synced 2024-06-22 00:35:32 +00:00

Merge with git+ssh://pasky.or.cz/srv/git/elinks.git

This commit is contained in:
witekfl 2006-01-11 20:40:57 +01:00 committed by
commit 0fae27fc27
28 changed files with 86 additions and 86 deletions

View File

@ -97,7 +97,7 @@ XGETTEXT = @XGETTEXT@
CONFIG_256_COLORS = @CONFIG_256_COLORS@
CONFIG_ASCIIDOC = @CONFIG_ASCIIDOC@
CONFIG_BACKTRACE = @CONFIG_BACKTRACE@
CONFIG_BEOS = @CONFIG_BEOS@
CONFIG_OS_BEOS = @CONFIG_OS_BEOS@
CONFIG_BITTORRENT = @CONFIG_BITTORRENT@
CONFIG_BOOKMARKS = @CONFIG_BOOKMARKS@
CONFIG_BZIP2 = @CONFIG_BZIP2@
@ -134,12 +134,12 @@ CONFIG_NLS = @CONFIG_NLS@
CONFIG_NNTP = @CONFIG_NNTP@
CONFIG_NO_ROOT_EXEC = @CONFIG_NO_ROOT_EXEC@
CONFIG_OPENSSL = @CONFIG_OPENSSL@
CONFIG_OS2 = @CONFIG_OS2@
CONFIG_OS_OS2 = @CONFIG_OS_OS2@
CONFIG_OWN_LIBC = @CONFIG_OWN_LIBC@
CONFIG_SCRIPTING_PERL = @CONFIG_SCRIPTING_PERL@
CONFIG_POD2HTML = @CONFIG_POD2HTML@
CONFIG_SCRIPTING_PYTHON = @CONFIG_SCRIPTING_PYTHON@
CONFIG_RISCOS = @CONFIG_RISCOS@
CONFIG_OS_RISCOS = @CONFIG_OS_RISCOS@
CONFIG_SCRIPTING_RUBY = @CONFIG_SCRIPTING_RUBY@
CONFIG_SCANNER = @CONFIG_SCANNER@
CONFIG_SCRIPTING = @CONFIG_SCRIPTING@
@ -151,9 +151,9 @@ CONFIG_SCRIPTING_SPIDERMONKEY = @CONFIG_SCRIPTING_SPIDERMONKEY@
CONFIG_SPIDERMONKEY = @CONFIG_SPIDERMONKEY@
CONFIG_SSL = @CONFIG_SSL@
CONFIG_SYSMOUSE = @CONFIG_SYSMOUSE@
CONFIG_UNIX = @CONFIG_UNIX@
CONFIG_OS_UNIX = @CONFIG_OS_UNIX@
CONFIG_URI_REWRITE = @CONFIG_URI_REWRITE@
CONFIG_WIN32 = @CONFIG_WIN32@
CONFIG_OS_WIN32 = @CONFIG_OS_WIN32@
CONFIG_XBEL_BOOKMARKS = @CONFIG_XBEL_BOOKMARKS@
CONFIG_XMLTO = @CONFIG_XMLTO@

View File

@ -1,5 +1,5 @@
AC_DEFUN([EL_CONFIG_OS2],
AC_DEFUN([EL_CONFIG_OS_OS2],
[
AC_MSG_CHECKING([for OS/2 threads])

View File

@ -1,5 +1,5 @@
AC_DEFUN([EL_CONFIG_WIN32],
AC_DEFUN([EL_CONFIG_OS_WIN32],
[
AC_MSG_CHECKING([for win32 threads])

View File

@ -142,31 +142,31 @@ kill me!
AC_MSG_RESULT([$]$1)
])
EL_CHECK_COMPILER_MACROS(CONFIG_BEOS, [BEOS], [__BEOS__])
AC_SUBST(CONFIG_BEOS)
EL_CHECK_COMPILER_MACROS(CONFIG_OS_BEOS, [BEOS], [__BEOS__])
AC_SUBST(CONFIG_OS_BEOS)
EL_CHECK_COMPILER_MACROS(CONFIG_RISCOS, [RISCOS], [__riscos__])
AC_SUBST(CONFIG_RISCOS)
EL_CHECK_COMPILER_MACROS(CONFIG_OS_RISCOS, [RISCOS], [__riscos__])
AC_SUBST(CONFIG_OS_RISCOS)
EL_CHECK_COMPILER_MACROS(CONFIG_WIN32, [WIN32], [_WIN32 __WIN32__])
AC_SUBST(CONFIG_WIN32)
EL_CHECK_COMPILER_MACROS(CONFIG_OS_WIN32, [WIN32], [_WIN32 __WIN32__])
AC_SUBST(CONFIG_OS_WIN32)
EL_CHECK_COMPILER_MACROS(CONFIG_OS2, [EMX], [__EMX__])
AC_SUBST(CONFIG_OS2)
test "$CONFIG_OS2" = yes && LDFLAGS=`echo "$LDFLAGS" | sed "s/-Zexe//g"`
EL_CHECK_COMPILER_MACROS(CONFIG_OS_OS2, [EMX], [__EMX__])
AC_SUBST(CONFIG_OS_OS2)
test "$CONFIG_OS_OS2" = yes && LDFLAGS=`echo "$LDFLAGS" | sed "s/-Zexe//g"`
AC_MSG_CHECKING([for UNIX])
dnl FIXME: some depend kind of mechanism
if test "$CONFIG_BEOS" = no && \
test "$CONFIG_RISCOS" = no && \
test "$CONFIG_WIN32" = no && \
test "$CONFIG_OS2" = no; then
EL_CONFIG(CONFIG_UNIX, [UNIX])
if test "$CONFIG_OS_BEOS" = no && \
test "$CONFIG_OS_RISCOS" = no && \
test "$CONFIG_OS_WIN32" = no && \
test "$CONFIG_OS_OS2" = no; then
EL_CONFIG(CONFIG_OS_UNIX, [UNIX])
else
CONFIG_UNIX=no
CONFIG_OS_UNIX=no
fi
AC_MSG_RESULT($CONFIG_UNIX)
AC_SUBST(CONFIG_UNIX)
AC_MSG_RESULT($CONFIG_OS_UNIX)
AC_SUBST(CONFIG_OS_UNIX)
dnl ===================================================================
dnl Checks for header files.
@ -484,16 +484,16 @@ dnl ===================================================================
dnl Checks for OS/2
dnl ===================================================================
if test "$CONFIG_OS2" = yes; then
EL_CONFIG_OS2
if test "$CONFIG_OS_OS2" = yes; then
EL_CONFIG_OS_OS2
fi
dnl ===================================================================
dnl Checks for Win32
dnl ===================================================================
if test "$CONFIG_WIN32" = yes; then
EL_CONFIG_WIN32
if test "$CONFIG_OS_WIN32" = yes; then
EL_CONFIG_OS_WIN32
fi
dnl ===================================================================
@ -1239,8 +1239,8 @@ AC_ARG_ENABLE(weehoofooboomookerchoo,
dnl == EMX hack
test "$CONFIG_OS2" = yes && LDFLAGS="$LDFLAGS -Zexe"
test "$CONFIG_OS2" = yes && LDFLAGS=`echo "$LDFLAGS" | sed "s/-Zbin-files//g"`
test "$CONFIG_OS_OS2" = yes && LDFLAGS="$LDFLAGS -Zexe"
test "$CONFIG_OS_OS2" = yes && LDFLAGS=`echo "$LDFLAGS" | sed "s/-Zbin-files//g"`
dnl ===================================================================

View File

@ -3,15 +3,15 @@
#define EL__ECMASCRIPT_SPIDERMONKEY_UTIL_H
/* For wild SpiderMonkey installations. */
#ifdef CONFIG_BEOS
#ifdef CONFIG_OS_BEOS
#define XP_BEOS
#elif CONFIG_OS2
#elif CONFIG_OS_OS2
#define XP_OS2
#elif CONFIG_RISCOS
#elif CONFIG_OS_RISCOS
#error Out of luck, buddy!
#elif CONFIG_UNIX
#elif CONFIG_OS_UNIX
#define XP_UNIX
#elif CONFIG_WIN32
#elif CONFIG_OS_WIN32
#define XP_WIN
#endif

View File

@ -2,11 +2,11 @@ top_builddir=../..
include $(top_builddir)/Makefile.config
INCLUDES += $(X_CFLAGS)
SUBDIRS-$(CONFIG_BEOS) += beos
SUBDIRS-$(CONFIG_OS2) += os2
SUBDIRS-$(CONFIG_RISCOS) += riscos
SUBDIRS-$(CONFIG_UNIX) += unix
SUBDIRS-$(CONFIG_WIN32) += win32
SUBDIRS-$(CONFIG_OS_BEOS) += beos
SUBDIRS-$(CONFIG_OS_OS2) += os2
SUBDIRS-$(CONFIG_OS_RISCOS) += riscos
SUBDIRS-$(CONFIG_OS_UNIX) += unix
SUBDIRS-$(CONFIG_OS_WIN32) += win32
OBJS = \
getifaddrs.o \

View File

@ -2,7 +2,7 @@
#ifndef EL__OSDEP_BEOS_BEOS_H
#define EL__OSDEP_BEOS_BEOS_H
#ifdef CONFIG_BEOS
#ifdef CONFIG_OS_BEOS
struct terminal;

View File

@ -2,7 +2,7 @@
#ifndef EL__OSDEP_BEOS_OVERRIDES_H
#define EL__OSDEP_BEOS_OVERRIDES_H
#ifdef CONFIG_BEOS
#ifdef CONFIG_OS_BEOS
#include <sys/time.h>
#include <sys/types.h>

View File

@ -2,7 +2,7 @@
#ifndef EL__OSDEP_BEOS_SYSINFO_H
#define EL__OSDEP_BEOS_SYSINFO_H
#ifdef CONFIG_BEOS
#ifdef CONFIG_OS_BEOS
#define SYSTEM_NAME "BeOS"
#define SYSTEM_STR "beos"

View File

@ -39,7 +39,7 @@
/* Attempt to workaround the EINTR mess. */
#if defined(EINTR) && !defined(CONFIG_WIN32)
#if defined(EINTR) && !defined(CONFIG_OS_WIN32)
#ifdef TEMP_FAILURE_RETRY /* GNU libc */
#define safe_read(fd, buf, count) TEMP_FAILURE_RETRY(read(fd, buf, count))
@ -71,12 +71,12 @@ safe_write(int fd, const void *buf, size_t count) {
}
#endif /* TEMP_FAILURE_RETRY */
#else /* EINTR && !CONFIG_WIN32 */
#else /* EINTR && !CONFIG_OS_WIN32 */
#define safe_read(fd, buf, count) read(fd, buf, count)
#define safe_write(fd, buf, count) write(fd, buf, count)
#endif /* EINTR && !CONFIG_WIN32 */
#endif /* EINTR && !CONFIG_OS_WIN32 */
#ifndef HAVE_FTELLO
#define ftello(stream) ftell(stream)

View File

@ -26,14 +26,14 @@ const struct open_in_new open_in_new[] = {
{ ENV_XWIN, XTERM_CMD, N_("~Xterm") },
{ ENV_TWIN, DEFAULT_TWTERM_CMD, N_("T~wterm") },
{ ENV_SCREEN, DEFAULT_SCREEN_CMD, N_("~Screen") },
#ifdef CONFIG_OS2
#ifdef CONFIG_OS_OS2
{ ENV_OS2VIO, DEFAULT_OS2_WINDOW_CMD, N_("~Window") },
{ ENV_OS2VIO, DEFAULT_OS2_FULLSCREEN_CMD, N_("~Full screen") },
#endif
#ifdef CONFIG_WIN32
#ifdef CONFIG_OS_WIN32
{ ENV_WIN32, "", N_("~Window") },
#endif
#ifdef CONFIG_BEOS
#ifdef CONFIG_OS_BEOS
{ ENV_BE, DEFAULT_BEOS_TERM_CMD, N_("~BeOS terminal") },
#endif
{ 0, NULL, NULL }

View File

@ -2,7 +2,7 @@
#ifndef EL__OSDEP_OS2_OS2_H
#define EL__OSDEP_OS2_OS2_H
#ifdef CONFIG_OS2
#ifdef CONFIG_OS_OS2
struct terminal;

View File

@ -2,7 +2,7 @@
#ifndef EL__OSDEP_OS2_SYSINFO_H
#define EL__OSDEP_OS2_SYSINFO_H
#ifdef CONFIG_OS2
#ifdef CONFIG_OS_OS2
#define SYSTEM_NAME "OS/2"
#define SYSTEM_STR "os2"

View File

@ -185,7 +185,7 @@ get_shell(void)
/* Terminal size */
#if !defined(CONFIG_OS2) && !defined(CONFIG_WIN32)
#if !defined(CONFIG_OS_OS2) && !defined(CONFIG_OS_WIN32)
static void
sigwinch(void *s)
@ -232,7 +232,7 @@ get_terminal_size(int fd, int *x, int *y)
/* Pipe */
#if defined(CONFIG_UNIX) || defined(CONFIG_BEOS) || defined(CONFIG_RISCOS)
#if defined(CONFIG_OS_UNIX) || defined(CONFIG_OS_BEOS) || defined(CONFIG_OS_RISCOS)
void
set_bin(int fd)
@ -245,7 +245,7 @@ c_pipe(int *fd)
return pipe(fd);
}
#elif defined(CONFIG_OS2) || defined(CONFIG_WIN32)
#elif defined(CONFIG_OS_OS2) || defined(CONFIG_OS_WIN32)
void
set_bin(int fd)
@ -291,7 +291,7 @@ is_gnuscreen(void)
}
#if defined(CONFIG_UNIX) || defined(CONFIG_WIN32)
#if defined(CONFIG_OS_UNIX) || defined(CONFIG_OS_WIN32)
int
is_xterm(void)
@ -332,9 +332,9 @@ is_xterm(void)
unsigned int resize_count = 0;
#ifndef CONFIG_OS2
#ifndef CONFIG_OS_OS2
#if !(defined(CONFIG_BEOS) && defined(HAVE_SETPGID)) && !defined(CONFIG_WIN32)
#if !(defined(CONFIG_OS_BEOS) && defined(HAVE_SETPGID)) && !defined(CONFIG_OS_WIN32)
int
exe(unsigned char *path)
@ -605,7 +605,7 @@ resize_window(int width, int height, int old_width, int old_height)
/* Threads */
#if defined(HAVE_BEGINTHREAD) || defined(CONFIG_BEOS)
#if defined(HAVE_BEGINTHREAD) || defined(CONFIG_OS_BEOS)
struct tdata {
void (*fn)(void *, int);
@ -687,7 +687,7 @@ done_draw(void)
#endif
#if !defined(CONFIG_WIN32)
#if !defined(CONFIG_OS_WIN32)
int
get_output_handle(void)
{
@ -706,8 +706,8 @@ get_ctl_handle(void)
#endif
#if !defined(CONFIG_BEOS) && !(defined(HAVE_BEGINTHREAD) && defined(HAVE_READ_KBD)) \
&& !defined(CONFIG_WIN32)
#if !defined(CONFIG_OS_BEOS) && !(defined(HAVE_BEGINTHREAD) && defined(HAVE_READ_KBD)) \
&& !defined(CONFIG_OS_WIN32)
int
get_input_handle(void)
@ -717,7 +717,7 @@ get_input_handle(void)
#endif
#ifndef CONFIG_WIN32
#ifndef CONFIG_OS_WIN32
void
init_osdep(void)
@ -729,7 +729,7 @@ init_osdep(void)
#endif
#if defined(CONFIG_UNIX) || defined(CONFIG_OS2) || defined(CONFIG_RISCOS)
#if defined(CONFIG_OS_UNIX) || defined(CONFIG_OS_OS2) || defined(CONFIG_OS_RISCOS)
void
terminate_osdep(void)
@ -738,7 +738,7 @@ terminate_osdep(void)
#endif
#ifndef CONFIG_BEOS
#ifndef CONFIG_OS_BEOS
void
block_stdin(void)
@ -798,7 +798,7 @@ resume_mouse(void *data)
#endif
#ifndef CONFIG_WIN32
#ifndef CONFIG_OS_WIN32
/* Create a bitmask consisting from system-independent envirnoment modifiers.
* This is then complemented by system-specific modifiers in an appropriate
* get_system_env() routine. */
@ -823,7 +823,7 @@ get_common_env(void)
}
#endif
#if defined(CONFIG_UNIX) || defined(CONFIG_RISCOS)
#if defined(CONFIG_OS_UNIX) || defined(CONFIG_OS_RISCOS)
int
get_system_env(void)
{
@ -838,7 +838,7 @@ can_resize_window(int environment)
return !!(environment & (ENV_OS2VIO | ENV_XWIN));
}
#ifndef CONFIG_OS2
#ifndef CONFIG_OS_OS2
int
can_open_os_shell(int environment)
{

View File

@ -2,7 +2,7 @@
#ifndef EL__OSDEP_RISCOS_RISCOS_H
#define EL__OSDEP_RISCOS_RISCOS_H
#ifdef CONFIG_RISCOS
#ifdef CONFIG_OS_RISCOS
/* TODO */

View File

@ -2,7 +2,7 @@
#ifndef EL__OSDEP_RISCOS_SYSINFO_H
#define EL__OSDEP_RISCOS_SYSINFO_H
#ifdef CONFIG_RISCOS
#ifdef CONFIG_OS_RISCOS
#define SYSTEM_NAME "RISC OS"
#define SYSTEM_STR "riscos"

View File

@ -239,7 +239,7 @@ elinks_raise(int signal)
#define INT16SZ 2
/* TODO: Move and populate. --jonas */
#ifdef CONFIG_WIN32
#ifdef CONFIG_OS_WIN32
#define SET_ERRNO(e) WSASetLastError(errno = (e))
#else
#define SET_ERRNO(e) errno = e

View File

@ -1,11 +1,11 @@
#ifndef EL__OSDEP_SYSTEM_H
#define EL__OSDEP_SYSTEM_H
#if !defined(CONFIG_BEOS) \
&& !defined(CONFIG_OS2) \
&& !defined(CONFIG_RISCOS) \
&& !defined(CONFIG_UNIX) \
&& !defined(CONFIG_WIN32)
#if !defined(CONFIG_OS_BEOS) \
&& !defined(CONFIG_OS_OS2) \
&& !defined(CONFIG_OS_RISCOS) \
&& !defined(CONFIG_OS_UNIX) \
&& !defined(CONFIG_OS_WIN32)
#warning No OS platform defined, maybe config.h was not included

View File

@ -2,7 +2,7 @@
#ifndef EL__OSDEP_UNIX_SYSINFO_H
#define EL__OSDEP_UNIX_SYSINFO_H
#ifdef CONFIG_UNIX
#ifdef CONFIG_OS_UNIX
#define SYSTEM_NAME "Unix"
#define SYSTEM_STR "unix"

View File

@ -2,7 +2,7 @@
#ifndef EL__OSDEP_UNIX_UNIX_H
#define EL__OSDEP_UNIX_UNIX_H
#ifdef CONFIG_UNIX
#ifdef CONFIG_OS_UNIX
/* TODO */

View File

@ -2,7 +2,7 @@
#ifndef EL__OSDEP_WIN32_OVERRIDES_H
#define EL__OSDEP_WIN32_OVERRIDES_H
#ifdef CONFIG_WIN32
#ifdef CONFIG_OS_WIN32
#ifdef HAVE_WINDOWS_H
#include <windows.h>

View File

@ -2,7 +2,7 @@
#ifndef EL__OSDEP_WIN32_SYSINFO_H
#define EL__OSDEP_WIN32_SYSINFO_H
#ifdef CONFIG_WIN32
#ifdef CONFIG_OS_WIN32
#define SYSTEM_NAME "Win32"
#define SYSTEM_STR "win32"

View File

@ -30,7 +30,7 @@
void
init_osdep(void)
{
#ifdef CONFIG_WIN32
#ifdef CONFIG_OS_WIN32
WSADATA ws;
WORD ver = MAKEWORD(1,1);
#ifdef CONFIG_IPV6

View File

@ -2,7 +2,7 @@
#ifndef EL__OSDEP_WIN32_WIN32_H
#define EL__OSDEP_WIN32_WIN32_H
#ifdef CONFIG_WIN32
#ifdef CONFIG_OS_WIN32
struct terminal;
@ -59,5 +59,5 @@ int tcgetattr(int fd, struct termios *termios_p);
int tcsetattr(int fd, int optional_actions, const struct termios *termios_p);
#endif /* __CYGWIN__ */
#endif /* CONFIG_WIN32 */
#endif /* CONFIG_OS_WIN32 */
#endif

View File

@ -714,7 +714,7 @@ erase_screen(struct terminal *term)
void
beep_terminal(struct terminal *term)
{
#ifdef CONFIG_WIN32
#ifdef CONFIG_OS_WIN32
MessageBeep(MB_ICONEXCLAMATION);
#else
hard_write(term->fdout, "\a", 1);

View File

@ -170,7 +170,7 @@ exec_thread(unsigned char *path, int p)
{
int plen = strlen(path + 1) + 2;
#if defined(HAVE_SETPGID) && !defined(CONFIG_BEOS) && !defined(HAVE_BEGINTHREAD)
#if defined(HAVE_SETPGID) && !defined(CONFIG_OS_BEOS) && !defined(HAVE_BEGINTHREAD)
if (path[0] == 2) setpgid(0, 0);
#endif
exe(path + 1);

View File

@ -40,7 +40,7 @@ static void
er(int bell, int shall_sleep, unsigned char *fmt, va_list params)
{
if (bell)
#ifdef CONFIG_WIN32
#ifdef CONFIG_OS_WIN32
MessageBeep(MB_ICONEXCLAMATION);
#else
fputc(7, stderr); /* load and annoying on Windows */

View File

@ -261,7 +261,7 @@ secure_close(struct secure_save_info *ssi)
}
if (ssi->secure_save && ssi->file_name && ssi->tmp_file_name) {
#ifdef CONFIG_OS2
#ifdef CONFIG_OS_OS2
/* OS/2 needs this, however it breaks atomicity on
* UN*X. */
unlink(ssi->file_name);