From 0ba9a00c3116b69745f2d5070ce772d5d4965dbf Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
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')

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