diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-11-26 14:32:20 -0800 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-11-26 14:32:20 -0800 |
| commit | cc9d5c9a3a5a3dec0811eb66fe4d7a716c436e2f (patch) | |
| tree | 9c597ae4a35e1b983f518dc655e19f6ec0ef71bb /indra/newview/lllocalbitmaps.cpp | |
| parent | be27ac665b3827fa43e053a133a8a16a08e9e2b1 (diff) | |
| parent | c57a40da173bb0622d56771ec9ab9998c3f74e28 (diff) | |
Pull and merge from https://bitbucket.org/lindenlab/viewer-development.
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. */ |