1
0
mirror of https://github.com/rkd77/elinks.git synced 2024-06-25 01:05:37 +00:00

CONFIG_UNIX -> CONFIG_OS_UNIX

This commit is contained in:
Laurent MONIN 2006-01-11 20:10:27 +01:00 committed by Laurent MONIN
parent 9eafa94fd9
commit 86f5f2cf48
8 changed files with 14 additions and 14 deletions

View File

@ -151,7 +151,7 @@ CONFIG_SCRIPTING_SPIDERMONKEY = @CONFIG_SCRIPTING_SPIDERMONKEY@
CONFIG_SPIDERMONKEY = @CONFIG_SPIDERMONKEY@ CONFIG_SPIDERMONKEY = @CONFIG_SPIDERMONKEY@
CONFIG_SSL = @CONFIG_SSL@ CONFIG_SSL = @CONFIG_SSL@
CONFIG_SYSMOUSE = @CONFIG_SYSMOUSE@ CONFIG_SYSMOUSE = @CONFIG_SYSMOUSE@
CONFIG_UNIX = @CONFIG_UNIX@ CONFIG_OS_UNIX = @CONFIG_OS_UNIX@
CONFIG_URI_REWRITE = @CONFIG_URI_REWRITE@ CONFIG_URI_REWRITE = @CONFIG_URI_REWRITE@
CONFIG_WIN32 = @CONFIG_WIN32@ CONFIG_WIN32 = @CONFIG_WIN32@
CONFIG_XBEL_BOOKMARKS = @CONFIG_XBEL_BOOKMARKS@ CONFIG_XBEL_BOOKMARKS = @CONFIG_XBEL_BOOKMARKS@

View File

@ -161,12 +161,12 @@ if test "$CONFIG_BEOS" = no && \
test "$CONFIG_OS_RISCOS" = no && \ test "$CONFIG_OS_RISCOS" = no && \
test "$CONFIG_WIN32" = no && \ test "$CONFIG_WIN32" = no && \
test "$CONFIG_OS_OS2" = no; then test "$CONFIG_OS_OS2" = no; then
EL_CONFIG(CONFIG_UNIX, [UNIX]) EL_CONFIG(CONFIG_OS_UNIX, [UNIX])
else else
CONFIG_UNIX=no CONFIG_OS_UNIX=no
fi fi
AC_MSG_RESULT($CONFIG_UNIX) AC_MSG_RESULT($CONFIG_OS_UNIX)
AC_SUBST(CONFIG_UNIX) AC_SUBST(CONFIG_OS_UNIX)
dnl =================================================================== dnl ===================================================================
dnl Checks for header files. dnl Checks for header files.

View File

@ -9,7 +9,7 @@
#define XP_OS2 #define XP_OS2
#elif CONFIG_OS_RISCOS #elif CONFIG_OS_RISCOS
#error Out of luck, buddy! #error Out of luck, buddy!
#elif CONFIG_UNIX #elif CONFIG_OS_UNIX
#define XP_UNIX #define XP_UNIX
#elif CONFIG_WIN32 #elif CONFIG_WIN32
#define XP_WIN #define XP_WIN

View File

@ -5,7 +5,7 @@ INCLUDES += $(X_CFLAGS)
SUBDIRS-$(CONFIG_BEOS) += beos 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_UNIX) += unix SUBDIRS-$(CONFIG_OS_UNIX) += unix
SUBDIRS-$(CONFIG_WIN32) += win32 SUBDIRS-$(CONFIG_WIN32) += win32
OBJS = \ OBJS = \

View File

@ -232,7 +232,7 @@ get_terminal_size(int fd, int *x, int *y)
/* Pipe */ /* 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 void
set_bin(int fd) 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 int
is_xterm(void) is_xterm(void)
@ -729,7 +729,7 @@ init_osdep(void)
#endif #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 void
terminate_osdep(void) terminate_osdep(void)
@ -823,7 +823,7 @@ get_common_env(void)
} }
#endif #endif
#if defined(CONFIG_UNIX) || defined(CONFIG_OS_RISCOS) #if defined(CONFIG_OS_UNIX) || defined(CONFIG_OS_RISCOS)
int int
get_system_env(void) get_system_env(void)
{ {

View File

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

View File

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

View File

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