diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-11-26 12:40:54 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-11-26 12:40:54 -0500 |
| commit | c57a40da173bb0622d56771ec9ab9998c3f74e28 (patch) | |
| tree | e6623bab5d0c56a2a789351d9c9eef9db405c5d3 /indra/llwindow/llwindowmacosx.h | |
| parent | a830812172d7eb163c06ead3155dc4b43ded4346 (diff) | |
| parent | 5a4b22e96bab0f0f268bb63c18d88223e2e4a0d6 (diff) | |
merge changes for DRTVWR-249
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 |