diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-11-26 12:40:54 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-11-26 12:40:54 -0500 |
| commit | c57a40da173bb0622d56771ec9ab9998c3f74e28 (patch) | |
| tree | e6623bab5d0c56a2a789351d9c9eef9db405c5d3 /indra/newview/lllocalbitmaps.cpp | |
| parent | a830812172d7eb163c06ead3155dc4b43ded4346 (diff) | |
| parent | 5a4b22e96bab0f0f268bb63c18d88223e2e4a0d6 (diff) | |
merge changes for DRTVWR-249
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. */ |