diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2012-11-20 14:46:24 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2012-11-20 14:46:24 -0500 |
| commit | 557293137c052d81f78a559add2ccae57216c06d (patch) | |
| tree | 15b0d971740f517ad8c0e3827538403671f1dc0d /indra/llcommon/fix_macros.h | |
| parent | 8b65c372501e1e7ca5fcaf2dcc7ffc9ff0840392 (diff) | |
| parent | e66dacddfd87ba6c7f116a87a5fc272edffae41d (diff) | |
Automated merge with http://hg.secondlife.com/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 |