aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-12-04 14:46:47 -05:00
Code

CONFIG_WIN32 -> CONFIG_OS_WIN32

Browse Source
This commit is contained in:
Laurent MONIN 2006-01-11 20:10:27 +01:00 committed by Laurent MONIN
parent 86f5f2cf48
commit 202965d338
16 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.config.in
View File

@ -153,7 +153,7 @@ CONFIG_SSL = @CONFIG_SSL@
CONFIG_SYSMOUSE = @CONFIG_SYSMOUSE@ CONFIG_SYSMOUSE = @CONFIG_SYSMOUSE@
CONFIG_OS_UNIX = @CONFIG_OS_UNIX@ CONFIG_OS_UNIX = @CONFIG_OS_UNIX@
CONFIG_URI_REWRITE = @CONFIG_URI_REWRITE@ CONFIG_URI_REWRITE = @CONFIG_URI_REWRITE@
CONFIG_WIN32 = @CONFIG_WIN32@ CONFIG_OS_WIN32 = @CONFIG_OS_WIN32@
CONFIG_XBEL_BOOKMARKS = @CONFIG_XBEL_BOOKMARKS@ CONFIG_XBEL_BOOKMARKS = @CONFIG_XBEL_BOOKMARKS@
CONFIG_XMLTO = @CONFIG_XMLTO@ CONFIG_XMLTO = @CONFIG_XMLTO@

2
config/m4/win32.m4
View File

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

10
configure.in
View File

@ -148,8 +148,8 @@ AC_SUBST(CONFIG_BEOS)
EL_CHECK_COMPILER_MACROS(CONFIG_OS_RISCOS, [RISCOS], [__riscos__]) EL_CHECK_COMPILER_MACROS(CONFIG_OS_RISCOS, [RISCOS], [__riscos__])
AC_SUBST(CONFIG_OS_RISCOS) AC_SUBST(CONFIG_OS_RISCOS)
EL_CHECK_COMPILER_MACROS(CONFIG_WIN32, [WIN32], [_WIN32 __WIN32__]) EL_CHECK_COMPILER_MACROS(CONFIG_OS_WIN32, [WIN32], [_WIN32 __WIN32__])
AC_SUBST(CONFIG_WIN32) AC_SUBST(CONFIG_OS_WIN32)
EL_CHECK_COMPILER_MACROS(CONFIG_OS_OS2, [EMX], [__EMX__]) EL_CHECK_COMPILER_MACROS(CONFIG_OS_OS2, [EMX], [__EMX__])
AC_SUBST(CONFIG_OS_OS2) AC_SUBST(CONFIG_OS_OS2)
@ -159,7 +159,7 @@ AC_MSG_CHECKING([for UNIX])
dnl FIXME: some depend kind of mechanism dnl FIXME: some depend kind of mechanism
if test "$CONFIG_BEOS" = no && \ if test "$CONFIG_BEOS" = no && \
test "$CONFIG_OS_RISCOS" = no && \ test "$CONFIG_OS_RISCOS" = no && \
test "$CONFIG_WIN32" = no && \ test "$CONFIG_OS_WIN32" = no && \
test "$CONFIG_OS_OS2" = no; then test "$CONFIG_OS_OS2" = no; then
EL_CONFIG(CONFIG_OS_UNIX, [UNIX]) EL_CONFIG(CONFIG_OS_UNIX, [UNIX])
else else
@ -492,8 +492,8 @@ dnl ===================================================================
dnl Checks for Win32 dnl Checks for Win32
dnl =================================================================== dnl ===================================================================
if test "$CONFIG_WIN32" = yes; then if test "$CONFIG_OS_WIN32" = yes; then
EL_CONFIG_WIN32 EL_CONFIG_OS_WIN32
fi fi
dnl =================================================================== dnl ===================================================================

2
src/ecmascript/spidermonkey/util.h
View File

@ -11,7 +11,7 @@
#error Out of luck, buddy! #error Out of luck, buddy!
#elif CONFIG_OS_UNIX #elif CONFIG_OS_UNIX
#define XP_UNIX #define XP_UNIX
#elif CONFIG_WIN32 #elif CONFIG_OS_WIN32
#define XP_WIN #define XP_WIN
#endif #endif

2
src/osdep/Makefile
View File

@ -6,7 +6,7 @@ SUBDIRS-$(CONFIG_BEOS) += beos
SUBDIRS-$(CONFIG_OS_OS2) += os2 SUBDIRS-$(CONFIG_OS_OS2) += os2
SUBDIRS-$(CONFIG_OS_RISCOS) += riscos SUBDIRS-$(CONFIG_OS_RISCOS) += riscos
SUBDIRS-$(CONFIG_OS_UNIX) += unix SUBDIRS-$(CONFIG_OS_UNIX) += unix
SUBDIRS-$(CONFIG_WIN32) += win32 SUBDIRS-$(CONFIG_OS_WIN32) += win32
OBJS = \ OBJS = \
getifaddrs.o \ getifaddrs.o \

6
src/osdep/generic.h
View File

@ -39,7 +39,7 @@
/* Attempt to workaround the EINTR mess. */ /* 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 */ #ifdef TEMP_FAILURE_RETRY /* GNU libc */
#define safe_read(fd, buf, count) TEMP_FAILURE_RETRY(read(fd, buf, count)) #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 */ #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_read(fd, buf, count) read(fd, buf, count)
#define safe_write(fd, buf, count) write(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 #ifndef HAVE_FTELLO
#define ftello(stream) ftell(stream) #define ftello(stream) ftell(stream)

2
src/osdep/newwin.c
View File

@ -30,7 +30,7 @@ const struct open_in_new open_in_new[] = {
{ ENV_OS2VIO, DEFAULT_OS2_WINDOW_CMD, N_("~Window") }, { ENV_OS2VIO, DEFAULT_OS2_WINDOW_CMD, N_("~Window") },
{ ENV_OS2VIO, DEFAULT_OS2_FULLSCREEN_CMD, N_("~Full screen") }, { ENV_OS2VIO, DEFAULT_OS2_FULLSCREEN_CMD, N_("~Full screen") },
#endif #endif
#ifdef CONFIG_WIN32 #ifdef CONFIG_OS_WIN32
{ ENV_WIN32, "", N_("~Window") }, { ENV_WIN32, "", N_("~Window") },
#endif #endif
#ifdef CONFIG_BEOS #ifdef CONFIG_BEOS

16
src/osdep/osdep.c
View File

@ -185,7 +185,7 @@ get_shell(void)
/* Terminal size */ /* Terminal size */
#if !defined(CONFIG_OS_OS2) && !defined(CONFIG_WIN32) #if !defined(CONFIG_OS_OS2) && !defined(CONFIG_OS_WIN32)
static void static void
sigwinch(void *s) sigwinch(void *s)
@ -245,7 +245,7 @@ c_pipe(int *fd)
return pipe(fd); return pipe(fd);
} }
#elif defined(CONFIG_OS_OS2) || defined(CONFIG_WIN32) #elif defined(CONFIG_OS_OS2) || defined(CONFIG_OS_WIN32)
void void
set_bin(int fd) 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 int
is_xterm(void) is_xterm(void)
@ -334,7 +334,7 @@ unsigned int resize_count = 0;
#ifndef CONFIG_OS_OS2 #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 int
exe(unsigned char *path) exe(unsigned char *path)
@ -687,7 +687,7 @@ done_draw(void)
#endif #endif
#if !defined(CONFIG_WIN32) #if !defined(CONFIG_OS_WIN32)
int int
get_output_handle(void) get_output_handle(void)
{ {
@ -707,7 +707,7 @@ get_ctl_handle(void)
#if !defined(CONFIG_BEOS) && !(defined(HAVE_BEGINTHREAD) && defined(HAVE_READ_KBD)) \ #if !defined(CONFIG_BEOS) && !(defined(HAVE_BEGINTHREAD) && defined(HAVE_READ_KBD)) \
&& !defined(CONFIG_WIN32) && !defined(CONFIG_OS_WIN32)
int int
get_input_handle(void) get_input_handle(void)
@ -717,7 +717,7 @@ get_input_handle(void)
#endif #endif
#ifndef CONFIG_WIN32 #ifndef CONFIG_OS_WIN32
void void
init_osdep(void) init_osdep(void)
@ -798,7 +798,7 @@ resume_mouse(void *data)
#endif #endif
#ifndef CONFIG_WIN32 #ifndef CONFIG_OS_WIN32
/* Create a bitmask consisting from system-independent envirnoment modifiers. /* Create a bitmask consisting from system-independent envirnoment modifiers.
* This is then complemented by system-specific modifiers in an appropriate * This is then complemented by system-specific modifiers in an appropriate
* get_system_env() routine. */ * get_system_env() routine. */

2
src/osdep/stub.c
View File

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

2
src/osdep/system.h
View File

@ -5,7 +5,7 @@
&& !defined(CONFIG_OS_OS2) \ && !defined(CONFIG_OS_OS2) \
&& !defined(CONFIG_OS_RISCOS) \ && !defined(CONFIG_OS_RISCOS) \
&& !defined(CONFIG_OS_UNIX) \ && !defined(CONFIG_OS_UNIX) \
&& !defined(CONFIG_WIN32) && !defined(CONFIG_OS_WIN32)
#warning No OS platform defined, maybe config.h was not included #warning No OS platform defined, maybe config.h was not included

2
src/osdep/win32/overrides.h
View File

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

2
src/osdep/win32/sysinfo.h
View File

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

2
src/osdep/win32/win32.c
View File

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

4
src/osdep/win32/win32.h
View File

@ -2,7 +2,7 @@
#ifndef EL__OSDEP_WIN32_WIN32_H #ifndef EL__OSDEP_WIN32_WIN32_H
#define EL__OSDEP_WIN32_WIN32_H #define EL__OSDEP_WIN32_WIN32_H
#ifdef CONFIG_WIN32 #ifdef CONFIG_OS_WIN32
struct terminal; 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); int tcsetattr(int fd, int optional_actions, const struct termios *termios_p);
#endif /* __CYGWIN__ */ #endif /* __CYGWIN__ */
#endif /* CONFIG_WIN32 */ #endif /* CONFIG_OS_WIN32 */
#endif #endif

2
src/terminal/screen.c
View File

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

2
src/util/error.c
View File

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