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/llwindow/llwindowmacosx.h | |
| parent | 8b65c372501e1e7ca5fcaf2dcc7ffc9ff0840392 (diff) | |
| parent | e66dacddfd87ba6c7f116a87a5fc272edffae41d (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/llwindow/llwindowmacosx.h')
| -rw-r--r-- | indra/llwindow/llwindowmacosx.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llwindow/llwindowmacosx.h b/indra/llwindow/llwindowmacosx.h index 52ba8b3bf3..af83b50097 100644 --- a/indra/llwindow/llwindowmacosx.h +++ b/indra/llwindow/llwindowmacosx.h @@ -36,8 +36,8 @@ #include <AGL/agl.h> // AssertMacros.h does bad things. +#include "fix_macros.h" #undef verify -#undef check #undef require |