summaryrefslogtreecommitdiff
path: root/indra/llwindow/llwindowmacosx.h
diff options
context:
space:
mode:
authorCho <cho@lindenlab.com>2013-01-14 23:09:01 +0000
committerCho <cho@lindenlab.com>2013-01-14 23:09:01 +0000
commitcb82e865a02a32f2d4e207974ff9373a99ceec95 (patch)
treece19fff3e038e7097b09440f955d1018c97f571a /indra/llwindow/llwindowmacosx.h
parentb47a7751990b240198d4e868f5a35bbd1b34e4ee (diff)
parent23ffb7db1bb065b5afbdcb94eab57720d604ae8d (diff)
merging latest changes?
Diffstat (limited to 'indra/llwindow/llwindowmacosx.h')
-rw-r--r--indra/llwindow/llwindowmacosx.h2
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