diff options
| author | Logan Dethrow <log@lindenlab.com> | 2012-12-13 18:35:07 -0500 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2012-12-13 18:35:07 -0500 |
| commit | 9015344f8e1d246726a8dc4fbfcefb7e74525e6a (patch) | |
| tree | ef17d2dbcc573a3126049e9bc444b78b7507ebc2 /indra/llcommon/fix_macros.h | |
| parent | 3565f6f36db90e1a9a5918d8087f9dc0ab61eb69 (diff) | |
| parent | 18ff702a9965ba8b9a17326b391f8edab01242f6 (diff) | |
Merged SH-3339 work with sunshine-internal. Still a WIP.
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 |