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/llwindow/lldragdropwin32.h | 2 ++
 indra/llwindow/llwindowwin32.h   | 1 +
 2 files changed, 3 insertions(+)

(limited to 'indra/llwindow')

diff --git a/indra/llwindow/lldragdropwin32.h b/indra/llwindow/lldragdropwin32.h
index 929e7f9e37..63054bffec 100644
--- a/indra/llwindow/lldragdropwin32.h
+++ b/indra/llwindow/lldragdropwin32.h
@@ -31,6 +31,7 @@
 #ifndef LL_LLDRAGDROP32_H
 #define LL_LLDRAGDROP32_H
 
+#define NOMINMAX
 #include <windows.h>
 #include <ole2.h>
 
@@ -54,6 +55,7 @@ class LLDragDropWin32
 #ifndef LL_LLDRAGDROP32_H
 #define LL_LLDRAGDROP32_H
 
+#define NOMINMAX
 #include <windows.h>
 #include <ole2.h>
 
diff --git a/indra/llwindow/llwindowwin32.h b/indra/llwindow/llwindowwin32.h
index 387e4cbdb6..dc1950fb31 100644
--- a/indra/llwindow/llwindowwin32.h
+++ b/indra/llwindow/llwindowwin32.h
@@ -29,6 +29,7 @@
 
 // Limit Windows API to small and manageable set.
 #define WIN32_LEAN_AND_MEAN
+#define NOMINMAX
 #include <winsock2.h>
 #include <windows.h>
 
-- 
cgit v1.2.3