From 2f91ffb45c44c3406b1b97dc987cfb7593852a46 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Tue, 8 Jan 2013 17:48:47 -0800 Subject: SH-3406 WIP convert fast timers to lltrace system fixed Windows build problem (NOMINMAX redefinition) --- indra/test_apps/llplugintest/llmediaplugintest.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'indra/test_apps/llplugintest/llmediaplugintest.cpp') 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 #include @@ -46,10 +53,6 @@ #define GLUI_FREEGLUT #endif -#if LL_WINDOWS -#pragma warning(disable: 4263) -#pragma warning(disable: 4264) -#endif #include "glui.h" -- cgit v1.2.3 From 0ba9a00c3116b69745f2d5070ce772d5d4965dbf Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Tue, 8 Jan 2013 23:50:27 -0800 Subject: SH-3468 WIP add memory tracking base class cleaned up hacks used to get unit tests working LLTrace::init now supports recursive initialization/cleanup put NOMINMAX back in win32 header wrappers --- indra/test_apps/llplugintest/llmediaplugintest.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'indra/test_apps/llplugintest/llmediaplugintest.cpp') diff --git a/indra/test_apps/llplugintest/llmediaplugintest.cpp b/indra/test_apps/llplugintest/llmediaplugintest.cpp index 99a82ed555..fa4f5abd28 100644 --- a/indra/test_apps/llplugintest/llmediaplugintest.cpp +++ b/indra/test_apps/llplugintest/llmediaplugintest.cpp @@ -41,7 +41,6 @@ #if LL_WINDOWS #pragma warning(disable: 4263) #pragma warning(disable: 4264) -#undef NOMINMAX #endif #if __APPLE__ -- cgit v1.2.3