From b6ccfc0e07ec1ef109bf45bb8f83099afb45edd3 Mon Sep 17 00:00:00 2001 From: Laurent MONIN Date: Wed, 11 Jan 2006 20:10:26 +0100 Subject: [PATCH 1/5] CONFIG_OS2 -> CONFIG_OS_OS2 --- Makefile.config.in | 2 +- config/m4/os2.m4 | 2 +- configure.in | 16 ++++++++-------- src/ecmascript/spidermonkey/util.h | 2 +- src/osdep/Makefile | 2 +- src/osdep/newwin.c | 2 +- src/osdep/os2/os2.h | 2 +- src/osdep/os2/sysinfo.h | 2 +- src/osdep/osdep.c | 10 +++++----- src/osdep/system.h | 2 +- src/util/secsave.c | 2 +- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Makefile.config.in b/Makefile.config.in index 10e4330d..4a6b6cf1 100644 --- a/Makefile.config.in +++ b/Makefile.config.in @@ -134,7 +134,7 @@ 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@ diff --git a/config/m4/os2.m4 b/config/m4/os2.m4 index 6a46400a..7e3bd821 100644 --- a/config/m4/os2.m4 +++ b/config/m4/os2.m4 @@ -1,5 +1,5 @@ -AC_DEFUN([EL_CONFIG_OS2], +AC_DEFUN([EL_CONFIG_OS_OS2], [ AC_MSG_CHECKING([for OS/2 threads]) diff --git a/configure.in b/configure.in index c55c0d71..242db08b 100644 --- a/configure.in +++ b/configure.in @@ -151,16 +151,16 @@ AC_SUBST(CONFIG_RISCOS) EL_CHECK_COMPILER_MACROS(CONFIG_WIN32, [WIN32], [_WIN32 __WIN32__]) AC_SUBST(CONFIG_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 + test "$CONFIG_OS_OS2" = no; then EL_CONFIG(CONFIG_UNIX, [UNIX]) else CONFIG_UNIX=no @@ -484,8 +484,8 @@ 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 =================================================================== @@ -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 =================================================================== diff --git a/src/ecmascript/spidermonkey/util.h b/src/ecmascript/spidermonkey/util.h index b787251b..9caf547f 100644 --- a/src/ecmascript/spidermonkey/util.h +++ b/src/ecmascript/spidermonkey/util.h @@ -5,7 +5,7 @@ /* For wild SpiderMonkey installations. */ #ifdef CONFIG_BEOS #define XP_BEOS -#elif CONFIG_OS2 +#elif CONFIG_OS_OS2 #define XP_OS2 #elif CONFIG_RISCOS #error Out of luck, buddy! diff --git a/src/osdep/Makefile b/src/osdep/Makefile index 5ac1390b..c8187f76 100644 --- a/src/osdep/Makefile +++ b/src/osdep/Makefile @@ -3,7 +3,7 @@ include $(top_builddir)/Makefile.config INCLUDES += $(X_CFLAGS) SUBDIRS-$(CONFIG_BEOS) += beos -SUBDIRS-$(CONFIG_OS2) += os2 +SUBDIRS-$(CONFIG_OS_OS2) += os2 SUBDIRS-$(CONFIG_RISCOS) += riscos SUBDIRS-$(CONFIG_UNIX) += unix SUBDIRS-$(CONFIG_WIN32) += win32 diff --git a/src/osdep/newwin.c b/src/osdep/newwin.c index 8d82e6ff..1801872f 100644 --- a/src/osdep/newwin.c +++ b/src/osdep/newwin.c @@ -26,7 +26,7 @@ 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 diff --git a/src/osdep/os2/os2.h b/src/osdep/os2/os2.h index 838ef9de..99b3f6d9 100644 --- a/src/osdep/os2/os2.h +++ b/src/osdep/os2/os2.h @@ -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; diff --git a/src/osdep/os2/sysinfo.h b/src/osdep/os2/sysinfo.h index e64fc3f8..0c195c6e 100644 --- a/src/osdep/os2/sysinfo.h +++ b/src/osdep/os2/sysinfo.h @@ -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" diff --git a/src/osdep/osdep.c b/src/osdep/osdep.c index 1503f84d..a8b74f64 100644 --- a/src/osdep/osdep.c +++ b/src/osdep/osdep.c @@ -185,7 +185,7 @@ get_shell(void) /* Terminal size */ -#if !defined(CONFIG_OS2) && !defined(CONFIG_WIN32) +#if !defined(CONFIG_OS_OS2) && !defined(CONFIG_WIN32) static void sigwinch(void *s) @@ -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_WIN32) void set_bin(int fd) @@ -332,7 +332,7 @@ 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) @@ -729,7 +729,7 @@ init_osdep(void) #endif -#if defined(CONFIG_UNIX) || defined(CONFIG_OS2) || defined(CONFIG_RISCOS) +#if defined(CONFIG_UNIX) || defined(CONFIG_OS_OS2) || defined(CONFIG_RISCOS) void terminate_osdep(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) { diff --git a/src/osdep/system.h b/src/osdep/system.h index 32ac78f6..9cd72c46 100644 --- a/src/osdep/system.h +++ b/src/osdep/system.h @@ -2,7 +2,7 @@ #define EL__OSDEP_SYSTEM_H #if !defined(CONFIG_BEOS) \ - && !defined(CONFIG_OS2) \ + && !defined(CONFIG_OS_OS2) \ && !defined(CONFIG_RISCOS) \ && !defined(CONFIG_UNIX) \ && !defined(CONFIG_WIN32) diff --git a/src/util/secsave.c b/src/util/secsave.c index 448d5e74..3b3a306e 100644 --- a/src/util/secsave.c +++ b/src/util/secsave.c @@ -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); From 9eafa94fd9d0b19131c4744c34d9c0e284248abe Mon Sep 17 00:00:00 2001 From: Laurent MONIN Date: Wed, 11 Jan 2006 20:10:26 +0100 Subject: [PATCH 2/5] CONFIG_RISCOS -> CONFIG_OS_RISCOS --- Makefile.config.in | 2 +- configure.in | 6 +++--- src/ecmascript/spidermonkey/util.h | 2 +- src/osdep/Makefile | 2 +- src/osdep/osdep.c | 6 +++--- src/osdep/riscos/riscos.h | 2 +- src/osdep/riscos/sysinfo.h | 2 +- src/osdep/system.h | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Makefile.config.in b/Makefile.config.in index 4a6b6cf1..47229732 100644 --- a/Makefile.config.in +++ b/Makefile.config.in @@ -139,7 +139,7 @@ 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@ diff --git a/configure.in b/configure.in index 242db08b..e88cb060 100644 --- a/configure.in +++ b/configure.in @@ -145,8 +145,8 @@ kill me! EL_CHECK_COMPILER_MACROS(CONFIG_BEOS, [BEOS], [__BEOS__]) AC_SUBST(CONFIG_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) @@ -158,7 +158,7 @@ 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_OS_RISCOS" = no && \ test "$CONFIG_WIN32" = no && \ test "$CONFIG_OS_OS2" = no; then EL_CONFIG(CONFIG_UNIX, [UNIX]) diff --git a/src/ecmascript/spidermonkey/util.h b/src/ecmascript/spidermonkey/util.h index 9caf547f..d2d49e3f 100644 --- a/src/ecmascript/spidermonkey/util.h +++ b/src/ecmascript/spidermonkey/util.h @@ -7,7 +7,7 @@ #define XP_BEOS #elif CONFIG_OS_OS2 #define XP_OS2 -#elif CONFIG_RISCOS +#elif CONFIG_OS_RISCOS #error Out of luck, buddy! #elif CONFIG_UNIX #define XP_UNIX diff --git a/src/osdep/Makefile b/src/osdep/Makefile index c8187f76..c4e1f282 100644 --- a/src/osdep/Makefile +++ b/src/osdep/Makefile @@ -4,7 +4,7 @@ INCLUDES += $(X_CFLAGS) SUBDIRS-$(CONFIG_BEOS) += beos SUBDIRS-$(CONFIG_OS_OS2) += os2 -SUBDIRS-$(CONFIG_RISCOS) += riscos +SUBDIRS-$(CONFIG_OS_RISCOS) += riscos SUBDIRS-$(CONFIG_UNIX) += unix SUBDIRS-$(CONFIG_WIN32) += win32 diff --git a/src/osdep/osdep.c b/src/osdep/osdep.c index a8b74f64..dd65431c 100644 --- a/src/osdep/osdep.c +++ b/src/osdep/osdep.c @@ -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_UNIX) || defined(CONFIG_BEOS) || defined(CONFIG_OS_RISCOS) void set_bin(int fd) @@ -729,7 +729,7 @@ init_osdep(void) #endif -#if defined(CONFIG_UNIX) || defined(CONFIG_OS_OS2) || defined(CONFIG_RISCOS) +#if defined(CONFIG_UNIX) || defined(CONFIG_OS_OS2) || defined(CONFIG_OS_RISCOS) void terminate_osdep(void) @@ -823,7 +823,7 @@ get_common_env(void) } #endif -#if defined(CONFIG_UNIX) || defined(CONFIG_RISCOS) +#if defined(CONFIG_UNIX) || defined(CONFIG_OS_RISCOS) int get_system_env(void) { diff --git a/src/osdep/riscos/riscos.h b/src/osdep/riscos/riscos.h index 0232d054..0acb126e 100644 --- a/src/osdep/riscos/riscos.h +++ b/src/osdep/riscos/riscos.h @@ -2,7 +2,7 @@ #ifndef EL__OSDEP_RISCOS_RISCOS_H #define EL__OSDEP_RISCOS_RISCOS_H -#ifdef CONFIG_RISCOS +#ifdef CONFIG_OS_RISCOS /* TODO */ diff --git a/src/osdep/riscos/sysinfo.h b/src/osdep/riscos/sysinfo.h index e7c2cdba..107ccf5f 100644 --- a/src/osdep/riscos/sysinfo.h +++ b/src/osdep/riscos/sysinfo.h @@ -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" diff --git a/src/osdep/system.h b/src/osdep/system.h index 9cd72c46..c3c138fb 100644 --- a/src/osdep/system.h +++ b/src/osdep/system.h @@ -3,7 +3,7 @@ #if !defined(CONFIG_BEOS) \ && !defined(CONFIG_OS_OS2) \ - && !defined(CONFIG_RISCOS) \ + && !defined(CONFIG_OS_RISCOS) \ && !defined(CONFIG_UNIX) \ && !defined(CONFIG_WIN32) From 86f5f2cf4841401c93b22775517aa8d7861070d6 Mon Sep 17 00:00:00 2001 From: Laurent MONIN Date: Wed, 11 Jan 2006 20:10:27 +0100 Subject: [PATCH 3/5] CONFIG_UNIX -> CONFIG_OS_UNIX --- Makefile.config.in | 2 +- configure.in | 8 ++++---- src/ecmascript/spidermonkey/util.h | 2 +- src/osdep/Makefile | 2 +- src/osdep/osdep.c | 8 ++++---- src/osdep/system.h | 2 +- src/osdep/unix/sysinfo.h | 2 +- src/osdep/unix/unix.h | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Makefile.config.in b/Makefile.config.in index 47229732..e06b9145 100644 --- a/Makefile.config.in +++ b/Makefile.config.in @@ -151,7 +151,7 @@ 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_XBEL_BOOKMARKS = @CONFIG_XBEL_BOOKMARKS@ diff --git a/configure.in b/configure.in index e88cb060..f7cdce9e 100644 --- a/configure.in +++ b/configure.in @@ -161,12 +161,12 @@ if test "$CONFIG_BEOS" = no && \ test "$CONFIG_OS_RISCOS" = no && \ test "$CONFIG_WIN32" = no && \ test "$CONFIG_OS_OS2" = no; then - EL_CONFIG(CONFIG_UNIX, [UNIX]) + 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. diff --git a/src/ecmascript/spidermonkey/util.h b/src/ecmascript/spidermonkey/util.h index d2d49e3f..f0e37bf8 100644 --- a/src/ecmascript/spidermonkey/util.h +++ b/src/ecmascript/spidermonkey/util.h @@ -9,7 +9,7 @@ #define XP_OS2 #elif CONFIG_OS_RISCOS #error Out of luck, buddy! -#elif CONFIG_UNIX +#elif CONFIG_OS_UNIX #define XP_UNIX #elif CONFIG_WIN32 #define XP_WIN diff --git a/src/osdep/Makefile b/src/osdep/Makefile index c4e1f282..b6eb7132 100644 --- a/src/osdep/Makefile +++ b/src/osdep/Makefile @@ -5,7 +5,7 @@ INCLUDES += $(X_CFLAGS) SUBDIRS-$(CONFIG_BEOS) += beos SUBDIRS-$(CONFIG_OS_OS2) += os2 SUBDIRS-$(CONFIG_OS_RISCOS) += riscos -SUBDIRS-$(CONFIG_UNIX) += unix +SUBDIRS-$(CONFIG_OS_UNIX) += unix SUBDIRS-$(CONFIG_WIN32) += win32 OBJS = \ diff --git a/src/osdep/osdep.c b/src/osdep/osdep.c index dd65431c..7b11f001 100644 --- a/src/osdep/osdep.c +++ b/src/osdep/osdep.c @@ -232,7 +232,7 @@ get_terminal_size(int fd, int *x, int *y) /* Pipe */ -#if defined(CONFIG_UNIX) || defined(CONFIG_BEOS) || defined(CONFIG_OS_RISCOS) +#if defined(CONFIG_OS_UNIX) || defined(CONFIG_BEOS) || defined(CONFIG_OS_RISCOS) 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_WIN32) int is_xterm(void) @@ -729,7 +729,7 @@ init_osdep(void) #endif -#if defined(CONFIG_UNIX) || defined(CONFIG_OS_OS2) || defined(CONFIG_OS_RISCOS) +#if defined(CONFIG_OS_UNIX) || defined(CONFIG_OS_OS2) || defined(CONFIG_OS_RISCOS) void terminate_osdep(void) @@ -823,7 +823,7 @@ get_common_env(void) } #endif -#if defined(CONFIG_UNIX) || defined(CONFIG_OS_RISCOS) +#if defined(CONFIG_OS_UNIX) || defined(CONFIG_OS_RISCOS) int get_system_env(void) { diff --git a/src/osdep/system.h b/src/osdep/system.h index c3c138fb..7586cec7 100644 --- a/src/osdep/system.h +++ b/src/osdep/system.h @@ -4,7 +4,7 @@ #if !defined(CONFIG_BEOS) \ && !defined(CONFIG_OS_OS2) \ && !defined(CONFIG_OS_RISCOS) \ - && !defined(CONFIG_UNIX) \ + && !defined(CONFIG_OS_UNIX) \ && !defined(CONFIG_WIN32) #warning No OS platform defined, maybe config.h was not included diff --git a/src/osdep/unix/sysinfo.h b/src/osdep/unix/sysinfo.h index 4bd9d9f8..7b4ef587 100644 --- a/src/osdep/unix/sysinfo.h +++ b/src/osdep/unix/sysinfo.h @@ -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" diff --git a/src/osdep/unix/unix.h b/src/osdep/unix/unix.h index 77bd6914..ba4d0145 100644 --- a/src/osdep/unix/unix.h +++ b/src/osdep/unix/unix.h @@ -2,7 +2,7 @@ #ifndef EL__OSDEP_UNIX_UNIX_H #define EL__OSDEP_UNIX_UNIX_H -#ifdef CONFIG_UNIX +#ifdef CONFIG_OS_UNIX /* TODO */ From 202965d33853ac11fa15f8c11e2cb87e829aa41b Mon Sep 17 00:00:00 2001 From: Laurent MONIN Date: Wed, 11 Jan 2006 20:10:27 +0100 Subject: [PATCH 4/5] CONFIG_WIN32 -> CONFIG_OS_WIN32 --- Makefile.config.in | 2 +- config/m4/win32.m4 | 2 +- configure.in | 10 +++++----- src/ecmascript/spidermonkey/util.h | 2 +- src/osdep/Makefile | 2 +- src/osdep/generic.h | 6 +++--- src/osdep/newwin.c | 2 +- src/osdep/osdep.c | 16 ++++++++-------- src/osdep/stub.c | 2 +- src/osdep/system.h | 2 +- src/osdep/win32/overrides.h | 2 +- src/osdep/win32/sysinfo.h | 2 +- src/osdep/win32/win32.c | 2 +- src/osdep/win32/win32.h | 4 ++-- src/terminal/screen.c | 2 +- src/util/error.c | 2 +- 16 files changed, 30 insertions(+), 30 deletions(-) diff --git a/Makefile.config.in b/Makefile.config.in index e06b9145..7e63e785 100644 --- a/Makefile.config.in +++ b/Makefile.config.in @@ -153,7 +153,7 @@ CONFIG_SSL = @CONFIG_SSL@ CONFIG_SYSMOUSE = @CONFIG_SYSMOUSE@ 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@ diff --git a/config/m4/win32.m4 b/config/m4/win32.m4 index 6f4d31c9..cb9ce1b0 100644 --- a/config/m4/win32.m4 +++ b/config/m4/win32.m4 @@ -1,5 +1,5 @@ -AC_DEFUN([EL_CONFIG_WIN32], +AC_DEFUN([EL_CONFIG_OS_WIN32], [ AC_MSG_CHECKING([for win32 threads]) diff --git a/configure.in b/configure.in index f7cdce9e..c118dc1a 100644 --- a/configure.in +++ b/configure.in @@ -148,8 +148,8 @@ AC_SUBST(CONFIG_BEOS) 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_OS_OS2, [EMX], [__EMX__]) AC_SUBST(CONFIG_OS_OS2) @@ -159,7 +159,7 @@ AC_MSG_CHECKING([for UNIX]) dnl FIXME: some depend kind of mechanism if test "$CONFIG_BEOS" = no && \ test "$CONFIG_OS_RISCOS" = no && \ - test "$CONFIG_WIN32" = no && \ + test "$CONFIG_OS_WIN32" = no && \ test "$CONFIG_OS_OS2" = no; then EL_CONFIG(CONFIG_OS_UNIX, [UNIX]) else @@ -492,8 +492,8 @@ 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 =================================================================== diff --git a/src/ecmascript/spidermonkey/util.h b/src/ecmascript/spidermonkey/util.h index f0e37bf8..8790cfa6 100644 --- a/src/ecmascript/spidermonkey/util.h +++ b/src/ecmascript/spidermonkey/util.h @@ -11,7 +11,7 @@ #error Out of luck, buddy! #elif CONFIG_OS_UNIX #define XP_UNIX -#elif CONFIG_WIN32 +#elif CONFIG_OS_WIN32 #define XP_WIN #endif diff --git a/src/osdep/Makefile b/src/osdep/Makefile index b6eb7132..cff73adb 100644 --- a/src/osdep/Makefile +++ b/src/osdep/Makefile @@ -6,7 +6,7 @@ SUBDIRS-$(CONFIG_BEOS) += beos SUBDIRS-$(CONFIG_OS_OS2) += os2 SUBDIRS-$(CONFIG_OS_RISCOS) += riscos SUBDIRS-$(CONFIG_OS_UNIX) += unix -SUBDIRS-$(CONFIG_WIN32) += win32 +SUBDIRS-$(CONFIG_OS_WIN32) += win32 OBJS = \ getifaddrs.o \ diff --git a/src/osdep/generic.h b/src/osdep/generic.h index 2e4173e5..0dbc4856 100644 --- a/src/osdep/generic.h +++ b/src/osdep/generic.h @@ -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) diff --git a/src/osdep/newwin.c b/src/osdep/newwin.c index 1801872f..63aa568f 100644 --- a/src/osdep/newwin.c +++ b/src/osdep/newwin.c @@ -30,7 +30,7 @@ const struct open_in_new open_in_new[] = { { 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 diff --git a/src/osdep/osdep.c b/src/osdep/osdep.c index 7b11f001..7c84f264 100644 --- a/src/osdep/osdep.c +++ b/src/osdep/osdep.c @@ -185,7 +185,7 @@ get_shell(void) /* Terminal size */ -#if !defined(CONFIG_OS_OS2) && !defined(CONFIG_WIN32) +#if !defined(CONFIG_OS_OS2) && !defined(CONFIG_OS_WIN32) static void sigwinch(void *s) @@ -245,7 +245,7 @@ c_pipe(int *fd) return pipe(fd); } -#elif defined(CONFIG_OS_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_OS_UNIX) || defined(CONFIG_WIN32) +#if defined(CONFIG_OS_UNIX) || defined(CONFIG_OS_WIN32) int is_xterm(void) @@ -334,7 +334,7 @@ unsigned int resize_count = 0; #ifndef CONFIG_OS_OS2 -#if !(defined(CONFIG_BEOS) && defined(HAVE_SETPGID)) && !defined(CONFIG_WIN32) +#if !(defined(CONFIG_BEOS) && defined(HAVE_SETPGID)) && !defined(CONFIG_OS_WIN32) int exe(unsigned char *path) @@ -687,7 +687,7 @@ done_draw(void) #endif -#if !defined(CONFIG_WIN32) +#if !defined(CONFIG_OS_WIN32) int get_output_handle(void) { @@ -707,7 +707,7 @@ get_ctl_handle(void) #if !defined(CONFIG_BEOS) && !(defined(HAVE_BEGINTHREAD) && defined(HAVE_READ_KBD)) \ - && !defined(CONFIG_WIN32) + && !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) @@ -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. */ diff --git a/src/osdep/stub.c b/src/osdep/stub.c index a2494744..f8da1d4d 100644 --- a/src/osdep/stub.c +++ b/src/osdep/stub.c @@ -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 diff --git a/src/osdep/system.h b/src/osdep/system.h index 7586cec7..eee3be6e 100644 --- a/src/osdep/system.h +++ b/src/osdep/system.h @@ -5,7 +5,7 @@ && !defined(CONFIG_OS_OS2) \ && !defined(CONFIG_OS_RISCOS) \ && !defined(CONFIG_OS_UNIX) \ - && !defined(CONFIG_WIN32) + && !defined(CONFIG_OS_WIN32) #warning No OS platform defined, maybe config.h was not included diff --git a/src/osdep/win32/overrides.h b/src/osdep/win32/overrides.h index 2e816548..5b5aa106 100644 --- a/src/osdep/win32/overrides.h +++ b/src/osdep/win32/overrides.h @@ -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 diff --git a/src/osdep/win32/sysinfo.h b/src/osdep/win32/sysinfo.h index c0e512ed..9327680b 100644 --- a/src/osdep/win32/sysinfo.h +++ b/src/osdep/win32/sysinfo.h @@ -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" diff --git a/src/osdep/win32/win32.c b/src/osdep/win32/win32.c index 12aa865d..15d2aa4c 100644 --- a/src/osdep/win32/win32.c +++ b/src/osdep/win32/win32.c @@ -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 diff --git a/src/osdep/win32/win32.h b/src/osdep/win32/win32.h index d4e9cb8a..959284a4 100644 --- a/src/osdep/win32/win32.h +++ b/src/osdep/win32/win32.h @@ -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 diff --git a/src/terminal/screen.c b/src/terminal/screen.c index 9b3d359a..1d44f595 100644 --- a/src/terminal/screen.c +++ b/src/terminal/screen.c @@ -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); diff --git a/src/util/error.c b/src/util/error.c index 0c2d1cd1..b645b1e6 100644 --- a/src/util/error.c +++ b/src/util/error.c @@ -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 */ From 3f9bb0d7f9834b7cd2068a794c537b1400df2e3d Mon Sep 17 00:00:00 2001 From: Laurent MONIN Date: Wed, 11 Jan 2006 20:12:59 +0100 Subject: [PATCH 5/5] CONFIG_BEOS -> CONFIG_OS_BEOS --- Makefile.config.in | 2 +- configure.in | 6 +++--- src/ecmascript/spidermonkey/util.h | 2 +- src/osdep/Makefile | 2 +- src/osdep/beos/beos.h | 2 +- src/osdep/beos/overrides.h | 2 +- src/osdep/beos/sysinfo.h | 2 +- src/osdep/newwin.c | 2 +- src/osdep/osdep.c | 10 +++++----- src/osdep/system.h | 2 +- src/terminal/terminal.c | 2 +- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Makefile.config.in b/Makefile.config.in index 7e63e785..02fec130 100644 --- a/Makefile.config.in +++ b/Makefile.config.in @@ -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@ diff --git a/configure.in b/configure.in index c118dc1a..73183a2b 100644 --- a/configure.in +++ b/configure.in @@ -142,8 +142,8 @@ 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_OS_RISCOS, [RISCOS], [__riscos__]) AC_SUBST(CONFIG_OS_RISCOS) @@ -157,7 +157,7 @@ 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 && \ +if test "$CONFIG_OS_BEOS" = no && \ test "$CONFIG_OS_RISCOS" = no && \ test "$CONFIG_OS_WIN32" = no && \ test "$CONFIG_OS_OS2" = no; then diff --git a/src/ecmascript/spidermonkey/util.h b/src/ecmascript/spidermonkey/util.h index 8790cfa6..22793da0 100644 --- a/src/ecmascript/spidermonkey/util.h +++ b/src/ecmascript/spidermonkey/util.h @@ -3,7 +3,7 @@ #define EL__ECMASCRIPT_SPIDERMONKEY_UTIL_H /* For wild SpiderMonkey installations. */ -#ifdef CONFIG_BEOS +#ifdef CONFIG_OS_BEOS #define XP_BEOS #elif CONFIG_OS_OS2 #define XP_OS2 diff --git a/src/osdep/Makefile b/src/osdep/Makefile index cff73adb..0c5b0126 100644 --- a/src/osdep/Makefile +++ b/src/osdep/Makefile @@ -2,7 +2,7 @@ top_builddir=../.. include $(top_builddir)/Makefile.config INCLUDES += $(X_CFLAGS) -SUBDIRS-$(CONFIG_BEOS) += beos +SUBDIRS-$(CONFIG_OS_BEOS) += beos SUBDIRS-$(CONFIG_OS_OS2) += os2 SUBDIRS-$(CONFIG_OS_RISCOS) += riscos SUBDIRS-$(CONFIG_OS_UNIX) += unix diff --git a/src/osdep/beos/beos.h b/src/osdep/beos/beos.h index 484a97ec..306fa550 100644 --- a/src/osdep/beos/beos.h +++ b/src/osdep/beos/beos.h @@ -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; diff --git a/src/osdep/beos/overrides.h b/src/osdep/beos/overrides.h index 4ee21c33..cd67b216 100644 --- a/src/osdep/beos/overrides.h +++ b/src/osdep/beos/overrides.h @@ -2,7 +2,7 @@ #ifndef EL__OSDEP_BEOS_OVERRIDES_H #define EL__OSDEP_BEOS_OVERRIDES_H -#ifdef CONFIG_BEOS +#ifdef CONFIG_OS_BEOS #include #include diff --git a/src/osdep/beos/sysinfo.h b/src/osdep/beos/sysinfo.h index b716fa82..22c28a6b 100644 --- a/src/osdep/beos/sysinfo.h +++ b/src/osdep/beos/sysinfo.h @@ -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" diff --git a/src/osdep/newwin.c b/src/osdep/newwin.c index 63aa568f..f3ac1d1d 100644 --- a/src/osdep/newwin.c +++ b/src/osdep/newwin.c @@ -33,7 +33,7 @@ const struct open_in_new open_in_new[] = { #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 } diff --git a/src/osdep/osdep.c b/src/osdep/osdep.c index 7c84f264..1df9e332 100644 --- a/src/osdep/osdep.c +++ b/src/osdep/osdep.c @@ -232,7 +232,7 @@ get_terminal_size(int fd, int *x, int *y) /* Pipe */ -#if defined(CONFIG_OS_UNIX) || defined(CONFIG_BEOS) || defined(CONFIG_OS_RISCOS) +#if defined(CONFIG_OS_UNIX) || defined(CONFIG_OS_BEOS) || defined(CONFIG_OS_RISCOS) void set_bin(int fd) @@ -334,7 +334,7 @@ unsigned int resize_count = 0; #ifndef CONFIG_OS_OS2 -#if !(defined(CONFIG_BEOS) && defined(HAVE_SETPGID)) && !defined(CONFIG_OS_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); @@ -706,7 +706,7 @@ get_ctl_handle(void) #endif -#if !defined(CONFIG_BEOS) && !(defined(HAVE_BEGINTHREAD) && defined(HAVE_READ_KBD)) \ +#if !defined(CONFIG_OS_BEOS) && !(defined(HAVE_BEGINTHREAD) && defined(HAVE_READ_KBD)) \ && !defined(CONFIG_OS_WIN32) int @@ -738,7 +738,7 @@ terminate_osdep(void) #endif -#ifndef CONFIG_BEOS +#ifndef CONFIG_OS_BEOS void block_stdin(void) diff --git a/src/osdep/system.h b/src/osdep/system.h index eee3be6e..d616ba6b 100644 --- a/src/osdep/system.h +++ b/src/osdep/system.h @@ -1,7 +1,7 @@ #ifndef EL__OSDEP_SYSTEM_H #define EL__OSDEP_SYSTEM_H -#if !defined(CONFIG_BEOS) \ +#if !defined(CONFIG_OS_BEOS) \ && !defined(CONFIG_OS_OS2) \ && !defined(CONFIG_OS_RISCOS) \ && !defined(CONFIG_OS_UNIX) \ diff --git a/src/terminal/terminal.c b/src/terminal/terminal.c index 51ae2379..bc7f12a2 100644 --- a/src/terminal/terminal.c +++ b/src/terminal/terminal.c @@ -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);