diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-01-10 14:51:59 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-01-10 14:51:59 -0800 |
| commit | 573ab07a40acc78e28ae390331d862d3f858bb07 (patch) | |
| tree | 7944ca93182468372186d202e45ba1ddcd7635b2 /indra/newview/lllocalbitmaps.cpp | |
| parent | 45e72bf3cbd08eef96663d569cec3ecae198a8e4 (diff) | |
| parent | fde976cf2bf9740dcd821ad37f0747beaabe34dd (diff) | |
Merge pull from lindenlab/viewer-beta
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. */ |