diff options
| author | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2012-12-04 15:03:34 -0800 |
|---|---|---|
| committer | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2012-12-04 15:03:34 -0800 |
| commit | 7fe4fbe6741c4a5f140bf1b52ced9957d408a53a (patch) | |
| tree | 96c5d4021a43b57e6e47cbb34edad12c1e7016b0 /indra/newview/lllocalbitmaps.cpp | |
| parent | fddd386804889f491d51b6ea597f18ec6fd8170c (diff) | |
| parent | 40e78a80cc293874216cdc8730d93cba8e987052 (diff) | |
Pull in upstream viewer-development via viewer-lion
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. */ |