From 35baf71fe8840db05a9db154634ab5d7ca7d2cf2 Mon Sep 17 00:00:00 2001
From: Ykkrosh <philip@wildfiregames.com>
Date: Fri, 20 Aug 2004 14:02:53 +0000
Subject: [PATCH] Define XP_* globally, for anything that uses SpiderMonkey
 directly

This was SVN commit r1025.
---
 source/lib/config.h              |  6 ++++++
 source/scripting/ScriptingHost.h | 10 ----------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/source/lib/config.h b/source/lib/config.h
index 6d232b5f67..76a5ce4386 100755
--- a/source/lib/config.h
+++ b/source/lib/config.h
@@ -5,17 +5,21 @@
 // Windows
 #if defined(_WIN32) || defined(WIN32)
 # define OS_WIN
+# define XP_WIN
 // Linux
 #elif defined(linux) || defined(__linux) || defined(__linux__)
 # define OS_LINUX
 # define OS_UNIX
+# define XP_UNIX
 // Mac OS X
 #elif defined(MAC_OS_X
 # define OS_MACOSX
 # define OS_UNIX
+# define XP_UNIX
 // Mac OS 9 or below
 #elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__)
 # define OS_MACOS
+# define XP_MAC
 // BSD
 #elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
 # define OS_BSD
@@ -25,12 +29,14 @@
 // BeOS
 #elif defined(__BEOS__)
 # define OS_BEOS
+# define XP_BEOS
 // Amiga
 #elif defined(__amigaos__)
 # define OS_AMIGA
 // Unix-based
 #elif defined(unix) || defined(__unix) || defined(_XOPEN_SOURCE) || defined(_POSIX_SOURCE)
 # define OS_UNIX
+# define XP_UNIX
 #else
 # error "unknown OS - add define here"
 #endif
diff --git a/source/scripting/ScriptingHost.h b/source/scripting/ScriptingHost.h
index 4a45e48c6c..687b63531e 100755
--- a/source/scripting/ScriptingHost.h
+++ b/source/scripting/ScriptingHost.h
@@ -2,16 +2,6 @@
 #ifndef _SCRIPTINGHOST_H_
 #define _SCRIPTINGHOST_H_
 
-#ifdef OS_WIN
-# define XP_WIN
-#endif
-
-#ifdef OS_UNIX
-# ifndef XP_UNIX
-#  define XP_UNIX
-# endif
-#endif
-
 #include "Errors.h"
 
 ERROR_GROUP(Scripting);