summaryrefslogtreecommitdiff
path: root/indra/llcommon/fix_macros.h
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2012-12-03 14:35:45 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2012-12-03 14:35:45 -0500
commit3be13024c51a714aa94ac55c2a972d3f523024f9 (patch)
treeb9c5c477da9ca20a9cf4e202bad84a5105a33a4a /indra/llcommon/fix_macros.h
parent5c245e941ace3f52dfa3539c473e2c02f207d8a3 (diff)
parentf0a11b1590a8d52281683275f836ac347ccc510f (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