diff options
author | maximbproductengine <maximbproductengine@lindenlab.com> | 2013-01-14 21:48:58 +0200 |
---|---|---|
committer | maximbproductengine <maximbproductengine@lindenlab.com> | 2013-01-14 21:48:58 +0200 |
commit | e206dff762e9055391a8627c0067de0a11319f2f (patch) | |
tree | 034876127c6dc54526babe9ce848b6813e29ef5a /indra/llwindow/llwindowsdl.h | |
parent | e44677ee79a38741d641fae74ba661b7e6b59794 (diff) | |
parent | 23ffb7db1bb065b5afbdcb94eab57720d604ae8d (diff) |
merge
Diffstat (limited to 'indra/llwindow/llwindowsdl.h')
-rw-r--r-- | indra/llwindow/llwindowsdl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llwindow/llwindowsdl.h b/indra/llwindow/llwindowsdl.h index 4e2a269ea3..c5ce892a04 100644 --- a/indra/llwindow/llwindowsdl.h +++ b/indra/llwindow/llwindowsdl.h @@ -41,8 +41,8 @@ #endif // AssertMacros.h does bad things. +#include "fix_macros.h" #undef verify -#undef check #undef require |