diff options
| author | Cho <cho@lindenlab.com> | 2013-01-14 23:09:01 +0000 |
|---|---|---|
| committer | Cho <cho@lindenlab.com> | 2013-01-14 23:09:01 +0000 |
| commit | cb82e865a02a32f2d4e207974ff9373a99ceec95 (patch) | |
| tree | ce19fff3e038e7097b09440f955d1018c97f571a /indra/newview/lllocalbitmaps.cpp | |
| parent | b47a7751990b240198d4e868f5a35bbd1b34e4ee (diff) | |
| parent | 23ffb7db1bb065b5afbdcb94eab57720d604ae8d (diff) | |
merging latest changes?
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. */ |