diff options
| author | Richard Linden <none@none> | 2013-01-08 17:48:47 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-01-08 17:48:47 -0800 |
| commit | 2f91ffb45c44c3406b1b97dc987cfb7593852a46 (patch) | |
| tree | 842e5a3a689c809ac14e760353c81236ad90463e /indra/test_apps/llplugintest | |
| parent | 3c341a11ab7b8f3fd18afcf3f50af6dfafa632c2 (diff) | |
SH-3406 WIP convert fast timers to lltrace system
fixed Windows build problem (NOMINMAX redefinition)
Diffstat (limited to 'indra/test_apps/llplugintest')
| -rw-r--r-- | indra/test_apps/llplugintest/llmediaplugintest.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/indra/test_apps/llplugintest/llmediaplugintest.cpp b/indra/test_apps/llplugintest/llmediaplugintest.cpp index 884b00f0cc..99a82ed555 100644 --- a/indra/test_apps/llplugintest/llmediaplugintest.cpp +++ b/indra/test_apps/llplugintest/llmediaplugintest.cpp @@ -37,6 +37,13 @@ #include "llmediaplugintest.h" + +#if LL_WINDOWS +#pragma warning(disable: 4263) +#pragma warning(disable: 4264) +#undef NOMINMAX +#endif + #if __APPLE__ #include <GLUT/glut.h> #include <CoreFoundation/CoreFoundation.h> @@ -46,10 +53,6 @@ #define GLUI_FREEGLUT #endif -#if LL_WINDOWS -#pragma warning(disable: 4263) -#pragma warning(disable: 4264) -#endif #include "glui.h" |