diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2012-11-16 18:08:40 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2012-11-16 18:08:40 -0500 |
| commit | aaf96507a15196145d903764dc905d8d6e7df7b0 (patch) | |
| tree | 2a628a73999aaaaa5fb2338516ffa5fc5b256d38 /indra/newview/lllocalbitmaps.cpp | |
| parent | 4d1b62f46be4322333e57fd09a195a51de7c7bf5 (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/lllocalbitmaps.cpp')
| -rw-r--r-- | indra/newview/lllocalbitmaps.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/lllocalbitmaps.cpp b/indra/newview/lllocalbitmaps.cpp index 459e52c4f4..97ba5b634a 100644 --- a/indra/newview/lllocalbitmaps.cpp +++ b/indra/newview/lllocalbitmaps.cpp @@ -32,9 +32,7 @@ #include "lllocalbitmaps.h" /* boost: will not compile unless equivalent is undef'd, beware. */ -#ifdef equivalent -#undef equivalent -#endif +#include "fix_macros.h" #include <boost/filesystem.hpp> /* image compression headers. */ |