1
0
mirror of https://github.com/rkd77/elinks.git synced 2025-01-03 14:57:44 -05:00

CONFIG_RISCOS -> CONFIG_OS_RISCOS

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

View File

@ -139,7 +139,7 @@ CONFIG_OWN_LIBC = @CONFIG_OWN_LIBC@
CONFIG_SCRIPTING_PERL = @CONFIG_SCRIPTING_PERL@ CONFIG_SCRIPTING_PERL = @CONFIG_SCRIPTING_PERL@
CONFIG_POD2HTML = @CONFIG_POD2HTML@ CONFIG_POD2HTML = @CONFIG_POD2HTML@
CONFIG_SCRIPTING_PYTHON = @CONFIG_SCRIPTING_PYTHON@ CONFIG_SCRIPTING_PYTHON = @CONFIG_SCRIPTING_PYTHON@
CONFIG_RISCOS = @CONFIG_RISCOS@ CONFIG_OS_RISCOS = @CONFIG_OS_RISCOS@
CONFIG_SCRIPTING_RUBY = @CONFIG_SCRIPTING_RUBY@ CONFIG_SCRIPTING_RUBY = @CONFIG_SCRIPTING_RUBY@
CONFIG_SCANNER = @CONFIG_SCANNER@ CONFIG_SCANNER = @CONFIG_SCANNER@
CONFIG_SCRIPTING = @CONFIG_SCRIPTING@ CONFIG_SCRIPTING = @CONFIG_SCRIPTING@

View File

@ -145,8 +145,8 @@ kill me!
EL_CHECK_COMPILER_MACROS(CONFIG_BEOS, [BEOS], [__BEOS__]) EL_CHECK_COMPILER_MACROS(CONFIG_BEOS, [BEOS], [__BEOS__])
AC_SUBST(CONFIG_BEOS) AC_SUBST(CONFIG_BEOS)
EL_CHECK_COMPILER_MACROS(CONFIG_RISCOS, [RISCOS], [__riscos__]) EL_CHECK_COMPILER_MACROS(CONFIG_OS_RISCOS, [RISCOS], [__riscos__])
AC_SUBST(CONFIG_RISCOS) AC_SUBST(CONFIG_OS_RISCOS)
EL_CHECK_COMPILER_MACROS(CONFIG_WIN32, [WIN32], [_WIN32 __WIN32__]) EL_CHECK_COMPILER_MACROS(CONFIG_WIN32, [WIN32], [_WIN32 __WIN32__])
AC_SUBST(CONFIG_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]) 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_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_UNIX, [UNIX])

View File

@ -7,7 +7,7 @@
#define XP_BEOS #define XP_BEOS
#elif CONFIG_OS_OS2 #elif CONFIG_OS_OS2
#define XP_OS2 #define XP_OS2
#elif CONFIG_RISCOS #elif CONFIG_OS_RISCOS
#error Out of luck, buddy! #error Out of luck, buddy!
#elif CONFIG_UNIX #elif CONFIG_UNIX
#define XP_UNIX #define XP_UNIX

View File

@ -4,7 +4,7 @@ INCLUDES += $(X_CFLAGS)
SUBDIRS-$(CONFIG_BEOS) += beos SUBDIRS-$(CONFIG_BEOS) += beos
SUBDIRS-$(CONFIG_OS_OS2) += os2 SUBDIRS-$(CONFIG_OS_OS2) += os2
SUBDIRS-$(CONFIG_RISCOS) += riscos SUBDIRS-$(CONFIG_OS_RISCOS) += riscos
SUBDIRS-$(CONFIG_UNIX) += unix SUBDIRS-$(CONFIG_UNIX) += unix
SUBDIRS-$(CONFIG_WIN32) += win32 SUBDIRS-$(CONFIG_WIN32) += win32

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_RISCOS) #if defined(CONFIG_UNIX) || defined(CONFIG_BEOS) || defined(CONFIG_OS_RISCOS)
void void
set_bin(int fd) set_bin(int fd)
@ -729,7 +729,7 @@ init_osdep(void)
#endif #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 void
terminate_osdep(void) terminate_osdep(void)
@ -823,7 +823,7 @@ get_common_env(void)
} }
#endif #endif
#if defined(CONFIG_UNIX) || defined(CONFIG_RISCOS) #if defined(CONFIG_UNIX) || defined(CONFIG_OS_RISCOS)
int int
get_system_env(void) get_system_env(void)
{ {

View File

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

View File

@ -2,7 +2,7 @@
#ifndef EL__OSDEP_RISCOS_SYSINFO_H #ifndef EL__OSDEP_RISCOS_SYSINFO_H
#define 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_NAME "RISC OS"
#define SYSTEM_STR "riscos" #define SYSTEM_STR "riscos"

View File

@ -3,7 +3,7 @@
#if !defined(CONFIG_BEOS) \ #if !defined(CONFIG_BEOS) \
&& !defined(CONFIG_OS_OS2) \ && !defined(CONFIG_OS_OS2) \
&& !defined(CONFIG_RISCOS) \ && !defined(CONFIG_OS_RISCOS) \
&& !defined(CONFIG_UNIX) \ && !defined(CONFIG_UNIX) \
&& !defined(CONFIG_WIN32) && !defined(CONFIG_WIN32)