From 202965d33853ac11fa15f8c11e2cb87e829aa41b Mon Sep 17 00:00:00 2001 From: Laurent MONIN Date: Wed, 11 Jan 2006 20:10:27 +0100 Subject: [PATCH] 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 */