summaryrefslogtreecommitdiff
path: root/indra/llcommon/fix_macros.h
diff options
context:
space:
mode:
authormaximbproductengine <maximbproductengine@lindenlab.com>2013-01-14 21:48:58 +0200
committermaximbproductengine <maximbproductengine@lindenlab.com>2013-01-14 21:48:58 +0200
commite206dff762e9055391a8627c0067de0a11319f2f (patch)
tree034876127c6dc54526babe9ce848b6813e29ef5a /indra/llcommon/fix_macros.h
parente44677ee79a38741d641fae74ba661b7e6b59794 (diff)
parent23ffb7db1bb065b5afbdcb94eab57720d604ae8d (diff)
merge
Diffstat (limited to 'indra/llcommon/fix_macros.h')
-rw-r--r--indra/llcommon/fix_macros.h25
1 files changed, 25 insertions, 0 deletions
diff --git a/indra/llcommon/fix_macros.h b/indra/llcommon/fix_macros.h
new file mode 100644
index 0000000000..ef959decff
--- /dev/null
+++ b/indra/llcommon/fix_macros.h
@@ -0,0 +1,25 @@
+/**
+ * @file fix_macros.h
+ * @author Nat Goodspeed
+ * @date 2012-11-16
+ * @brief The Mac system headers seem to #define macros with obnoxiously
+ * generic names, preventing any library from using those names. We've
+ * had to fix these in so many places that it's worth making a header
+ * file to handle it.
+ *
+ * $LicenseInfo:firstyear=2012&license=viewerlgpl$
+ * Copyright (c) 2012, Linden Research, Inc.
+ * $/LicenseInfo$
+ */
+
+// DON'T use an #include guard: every time we encounter this header, #undef
+// these macros all over again.
+
+// who injects MACROS with such generic names?! Grr.
+#ifdef equivalent
+#undef equivalent
+#endif
+
+#ifdef check
+#undef check
+#endif