diff options
author | Cho <cho@lindenlab.com> | 2013-01-14 23:09:01 +0000 |
---|---|---|
committer | Cho <cho@lindenlab.com> | 2013-01-14 23:09:01 +0000 |
commit | cb82e865a02a32f2d4e207974ff9373a99ceec95 (patch) | |
tree | ce19fff3e038e7097b09440f955d1018c97f571a /indra/newview/macutil_Prefix.h | |
parent | b47a7751990b240198d4e868f5a35bbd1b34e4ee (diff) | |
parent | 23ffb7db1bb065b5afbdcb94eab57720d604ae8d (diff) |
merging latest changes?
Diffstat (limited to 'indra/newview/macutil_Prefix.h')
-rw-r--r-- | indra/newview/macutil_Prefix.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/macutil_Prefix.h b/indra/newview/macutil_Prefix.h index fd8e927a08..b54a764a62 100644 --- a/indra/newview/macutil_Prefix.h +++ b/indra/newview/macutil_Prefix.h @@ -33,7 +33,7 @@ */ #include <Carbon/Carbon.h> +#include "fix_macros.h" -#undef check #undef verify #undef require |