diff options
| author | dolphin <dolphin@lindenlab.com> | 2013-01-02 09:47:17 -0800 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2013-01-02 09:47:17 -0800 |
| commit | e018720278af674528f43acc40af40a1d3d64e7d (patch) | |
| tree | 8f5e789148654315283d9ac5b74f89c15a7fa42d /indra/newview/macutil_Prefix.h | |
| parent | 179e944f45476e03eb7b828e427f9d299529ad12 (diff) | |
| parent | cd1871d2e39bfee8a6e5bc61ece40a764ff7cdb4 (diff) | |
Merge
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 |