From 50c0447808f7041d5af5017c847a462e9599bdb5 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 4 Oct 2011 13:26:54 -0700
Subject: disabled min and max windows macros another attempt at fixing gcc
 builds

---
 indra/llcommon/llapr.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'indra/llcommon/llapr.h')

diff --git a/indra/llcommon/llapr.h b/indra/llcommon/llapr.h
index 3f846f1314..286fc43a77 100644
--- a/indra/llcommon/llapr.h
+++ b/indra/llcommon/llapr.h
@@ -37,6 +37,9 @@
 	// 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
-- 
cgit v1.2.3