summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Noonan <steven@uplinklabs.net>2009-09-29 21:58:37 -0700
committerSteven Noonan <steven@uplinklabs.net>2009-09-30 00:29:41 -0700
commit47e13860d62fc4b3f3d574bb1ba9fbddd4137788 (patch)
treebb841ed77c6383fcce6ee4d72599cff615dd0014
parent6943c77da2eded654f24d677f81aa49fd8177b4c (diff)
downloadcrawl-ref-47e13860d62fc4b3f3d574bb1ba9fbddd4137788.tar.gz
crawl-ref-47e13860d62fc4b3f3d574bb1ba9fbddd4137788.zip
AppHdr.h: fix "already defined" macro warnings on OSX and FREEBSD
If you specify OSX as a macro, it shouldn't cause the compiler to throw a warning. Signed-off-by: Steven Noonan <steven@uplinklabs.net>
-rw-r--r--crawl-ref/source/AppHdr.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/crawl-ref/source/AppHdr.h b/crawl-ref/source/AppHdr.h
index c3ea5a403c..b3fa86b3e9 100644
--- a/crawl-ref/source/AppHdr.h
+++ b/crawl-ref/source/AppHdr.h
@@ -25,10 +25,14 @@
// For a list of predefined macros, see
// http://predef.sourceforge.net/
#if defined(__MACH__)
+ #ifndef OSX
#define OSX
+ #endif
#endif
#if defined(__FreeBSD__)
+ #ifndef FREEBSD
#define FREEBSD
+ #endif
#endif
// The maximum memory that the user-script Lua interpreter can