diff options
| author | rider <rider@lindenlab.com> | 2015-10-01 12:36:52 -0700 |
|---|---|---|
| committer | rider <rider@lindenlab.com> | 2015-10-01 12:36:52 -0700 |
| commit | ca81b19e80d0e0301b08bad9bd32ada937dea10d (patch) | |
| tree | 86e33382a19aa9b9f1555b8987a1a6b511b8cbe5 /indra/llcommon/fix_macros.h | |
| parent | 17ff449ae6b2759f212daa4fd3de0a7ea2664866 (diff) | |
| parent | 4334fd27e2215c1bfad3aa7ab7130b8c6b289de5 (diff) | |
Merge for Xcode 7
Diffstat (limited to 'indra/llcommon/fix_macros.h')
| -rwxr-xr-x | indra/llcommon/fix_macros.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/llcommon/fix_macros.h b/indra/llcommon/fix_macros.h index ef959decff..43c09c54bc 100755 --- a/indra/llcommon/fix_macros.h +++ b/indra/llcommon/fix_macros.h @@ -16,10 +16,6 @@ // these macros all over again. // who injects MACROS with such generic names?! Grr. -#ifdef equivalent -#undef equivalent -#endif - #ifdef check #undef check #endif |