From 86f5f2cf4841401c93b22775517aa8d7861070d6 Mon Sep 17 00:00:00 2001
From: Laurent MONIN <zas@norz.org>
Date: Wed, 11 Jan 2006 20:10:27 +0100
Subject: [PATCH] CONFIG_UNIX -> CONFIG_OS_UNIX

---
 Makefile.config.in                 | 2 +-
 configure.in                       | 8 ++++----
 src/ecmascript/spidermonkey/util.h | 2 +-
 src/osdep/Makefile                 | 2 +-
 src/osdep/osdep.c                  | 8 ++++----
 src/osdep/system.h                 | 2 +-
 src/osdep/unix/sysinfo.h           | 2 +-
 src/osdep/unix/unix.h              | 2 +-
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Makefile.config.in b/Makefile.config.in
index 47229732..e06b9145 100644
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -151,7 +151,7 @@ CONFIG_SCRIPTING_SPIDERMONKEY = @CONFIG_SCRIPTING_SPIDERMONKEY@
 CONFIG_SPIDERMONKEY = @CONFIG_SPIDERMONKEY@
 CONFIG_SSL = @CONFIG_SSL@
 CONFIG_SYSMOUSE = @CONFIG_SYSMOUSE@
-CONFIG_UNIX = @CONFIG_UNIX@
+CONFIG_OS_UNIX = @CONFIG_OS_UNIX@
 CONFIG_URI_REWRITE = @CONFIG_URI_REWRITE@
 CONFIG_WIN32 = @CONFIG_WIN32@
 CONFIG_XBEL_BOOKMARKS = @CONFIG_XBEL_BOOKMARKS@
diff --git a/configure.in b/configure.in
index e88cb060..f7cdce9e 100644
--- a/configure.in
+++ b/configure.in
@@ -161,12 +161,12 @@ if test "$CONFIG_BEOS" = no && \
    test "$CONFIG_OS_RISCOS" = no && \
    test "$CONFIG_WIN32" = no && \
    test "$CONFIG_OS_OS2" = no; then
-	EL_CONFIG(CONFIG_UNIX, [UNIX])
+	EL_CONFIG(CONFIG_OS_UNIX, [UNIX])
 else
-	CONFIG_UNIX=no
+	CONFIG_OS_UNIX=no
 fi
-AC_MSG_RESULT($CONFIG_UNIX)
-AC_SUBST(CONFIG_UNIX)
+AC_MSG_RESULT($CONFIG_OS_UNIX)
+AC_SUBST(CONFIG_OS_UNIX)
 
 dnl ===================================================================
 dnl Checks for header files.
diff --git a/src/ecmascript/spidermonkey/util.h b/src/ecmascript/spidermonkey/util.h
index d2d49e3f..f0e37bf8 100644
--- a/src/ecmascript/spidermonkey/util.h
+++ b/src/ecmascript/spidermonkey/util.h
@@ -9,7 +9,7 @@
 #define XP_OS2
 #elif CONFIG_OS_RISCOS
 #error Out of luck, buddy!
-#elif CONFIG_UNIX
+#elif CONFIG_OS_UNIX
 #define XP_UNIX
 #elif CONFIG_WIN32
 #define XP_WIN
diff --git a/src/osdep/Makefile b/src/osdep/Makefile
index c4e1f282..b6eb7132 100644
--- a/src/osdep/Makefile
+++ b/src/osdep/Makefile
@@ -5,7 +5,7 @@ INCLUDES += $(X_CFLAGS)
 SUBDIRS-$(CONFIG_BEOS)		+= beos
 SUBDIRS-$(CONFIG_OS_OS2)		+= os2
 SUBDIRS-$(CONFIG_OS_RISCOS)	+= riscos
-SUBDIRS-$(CONFIG_UNIX)		+= unix
+SUBDIRS-$(CONFIG_OS_UNIX)		+= unix
 SUBDIRS-$(CONFIG_WIN32)		+= win32
 
 OBJS = \
diff --git a/src/osdep/osdep.c b/src/osdep/osdep.c
index dd65431c..7b11f001 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_UNIX) || defined(CONFIG_BEOS) || defined(CONFIG_OS_RISCOS)
+#if defined(CONFIG_OS_UNIX) || defined(CONFIG_BEOS) || defined(CONFIG_OS_RISCOS)
 
 void
 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
 is_xterm(void)
@@ -729,7 +729,7 @@ init_osdep(void)
 
 #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
 terminate_osdep(void)
@@ -823,7 +823,7 @@ get_common_env(void)
 }
 #endif
 
-#if defined(CONFIG_UNIX) || defined(CONFIG_OS_RISCOS)
+#if defined(CONFIG_OS_UNIX) || defined(CONFIG_OS_RISCOS)
 int
 get_system_env(void)
 {
diff --git a/src/osdep/system.h b/src/osdep/system.h
index c3c138fb..7586cec7 100644
--- a/src/osdep/system.h
+++ b/src/osdep/system.h
@@ -4,7 +4,7 @@
 #if !defined(CONFIG_BEOS) \
      && !defined(CONFIG_OS_OS2) \
      && !defined(CONFIG_OS_RISCOS) \
-     && !defined(CONFIG_UNIX) \
+     && !defined(CONFIG_OS_UNIX) \
      && !defined(CONFIG_WIN32)
 
 #warning No OS platform defined, maybe config.h was not included
diff --git a/src/osdep/unix/sysinfo.h b/src/osdep/unix/sysinfo.h
index 4bd9d9f8..7b4ef587 100644
--- a/src/osdep/unix/sysinfo.h
+++ b/src/osdep/unix/sysinfo.h
@@ -2,7 +2,7 @@
 #ifndef EL__OSDEP_UNIX_SYSINFO_H
 #define EL__OSDEP_UNIX_SYSINFO_H
 
-#ifdef CONFIG_UNIX
+#ifdef CONFIG_OS_UNIX
 
 #define SYSTEM_NAME	"Unix"
 #define SYSTEM_STR	"unix"
diff --git a/src/osdep/unix/unix.h b/src/osdep/unix/unix.h
index 77bd6914..ba4d0145 100644
--- a/src/osdep/unix/unix.h
+++ b/src/osdep/unix/unix.h
@@ -2,7 +2,7 @@
 #ifndef EL__OSDEP_UNIX_UNIX_H
 #define EL__OSDEP_UNIX_UNIX_H
 
-#ifdef CONFIG_UNIX
+#ifdef CONFIG_OS_UNIX
 
 /* TODO */