From a8fcfc5e19811ce579799d415a9ad63a0f1f6dc7 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 4 Oct 2011 14:11:45 -0700
Subject: removed attempt at templating LLUI::Clamp values in order to get
 build working again

---
 indra/llcommon/llapr.h             | 3 ---
 indra/llcommon/llprocesslauncher.h | 1 -
 2 files changed, 4 deletions(-)

(limited to 'indra/llcommon')

diff --git a/indra/llcommon/llapr.h b/indra/llcommon/llapr.h
index 286fc43a77..3f846f1314 100644
--- a/indra/llcommon/llapr.h
+++ b/indra/llcommon/llapr.h
@@ -37,9 +37,6 @@
 	// If you get undefined symbols, find the appropriate
 	// Windows header file and include that in your .cpp file.
 	#define WIN32_LEAN_AND_MEAN
-	// do not define min() and max() macros, which collide with
-	// things like numeric_limits<T>
-	#define NOMINMAX
 	#include <winsock2.h>
 	#include <windows.h>
 #endif
diff --git a/indra/llcommon/llprocesslauncher.h b/indra/llcommon/llprocesslauncher.h
index 23e48b1823..954c249147 100644
--- a/indra/llcommon/llprocesslauncher.h
+++ b/indra/llcommon/llprocesslauncher.h
@@ -28,7 +28,6 @@
 #define LL_LLPROCESSLAUNCHER_H
 
 #if LL_WINDOWS
-#define NOMINMAX
 #include <windows.h>
 #endif
 
-- 
cgit v1.2.3