summaryrefslogtreecommitdiff
path: root/indra/newview/macutil_Prefix.h
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2012-11-16 18:08:40 -0500
committerNat Goodspeed <nat@lindenlab.com>2012-11-16 18:08:40 -0500
commitaaf96507a15196145d903764dc905d8d6e7df7b0 (patch)
tree2a628a73999aaaaa5fb2338516ffa5fc5b256d38 /indra/newview/macutil_Prefix.h
parent4d1b62f46be4322333e57fd09a195a51de7c7bf5 (diff)
Some Mac header #defines macros like check and equivalent -- gack!!
Given that third-party libraries (such as Boost) can and do use those names, properly namespace-scoped, it's unpardonable to break any such innocent usage with a macro. Given the pervasiveness of the need, introduce a header file with the requisite #undef directives.
Diffstat (limited to 'indra/newview/macutil_Prefix.h')
-rw-r--r--indra/newview/macutil_Prefix.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/macutil_Prefix.h b/indra/newview/macutil_Prefix.h
index fd8e927a08..b54a764a62 100644
--- a/indra/newview/macutil_Prefix.h
+++ b/indra/newview/macutil_Prefix.h
@@ -33,7 +33,7 @@
*/
#include <Carbon/Carbon.h>
+#include "fix_macros.h"
-#undef check
#undef verify
#undef require