From 3f9bb0d7f9834b7cd2068a794c537b1400df2e3d Mon Sep 17 00:00:00 2001 From: Laurent MONIN Date: Wed, 11 Jan 2006 20:12:59 +0100 Subject: [PATCH] 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);