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/llcommon/fix_macros.h | |
| parent | be27ac665b3827fa43e053a133a8a16a08e9e2b1 (diff) | |
| parent | c57a40da173bb0622d56771ec9ab9998c3f74e28 (diff) | |
Pull and merge from https://bitbucket.org/lindenlab/viewer-development.
Diffstat (limited to 'indra/llcommon/fix_macros.h')
| -rw-r--r-- | indra/llcommon/fix_macros.h | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/indra/llcommon/fix_macros.h b/indra/llcommon/fix_macros.h new file mode 100644 index 0000000000..ef959decff --- /dev/null +++ b/indra/llcommon/fix_macros.h @@ -0,0 +1,25 @@ +/** + * @file fix_macros.h + * @author Nat Goodspeed + * @date 2012-11-16 + * @brief The Mac system headers seem to #define macros with obnoxiously + * generic names, preventing any library from using those names. We've + * had to fix these in so many places that it's worth making a header + * file to handle it. + * + * $LicenseInfo:firstyear=2012&license=viewerlgpl$ + * Copyright (c) 2012, Linden Research, Inc. + * $/LicenseInfo$ + */ + +// DON'T use an #include guard: every time we encounter this header, #undef +// these macros all over again. + +// who injects MACROS with such generic names?! Grr. +#ifdef equivalent +#undef equivalent +#endif + +#ifdef check +#undef check +#endif |