summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/AppHdr.h
diff options
context:
space:
mode:
authorSteven Noonan <steven@uplinklabs.net>2009-09-29 21:58:37 -0700
committerSteven Noonan <steven@uplinklabs.net>2009-09-29 22:13:34 -0700
commit0fba3e2df87fefd89ba17cc355fac643c3e8dc49 (patch)
treef1723689ea5be2750e2a66d1bf7460cf0cc2d212 /crawl-ref/source/AppHdr.h
parent387ac2d1325685e364d9fd892d37db2139c94d30 (diff)
downloadcrawl-ref-0fba3e2df87fefd89ba17cc355fac643c3e8dc49.tar.gz
crawl-ref-0fba3e2df87fefd89ba17cc355fac643c3e8dc49.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>
Diffstat (limited to 'crawl-ref/source/AppHdr.h')
-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 6d9029ee8e..eb56602d3e 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