summaryrefslogtreecommitdiff
path: root/indra/llrender
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-10-04 13:26:54 -0700
committerRichard Linden <none@none>2011-10-04 13:26:54 -0700
commit50c0447808f7041d5af5017c847a462e9599bdb5 (patch)
treebde88047b2f6bd4df35cc95bd49757dbdccf11dc /indra/llrender
parent44e9fb446f3c92c3dfd9b5be8a3e02ec5a44ba00 (diff)
disabled min and max windows macros
another attempt at fixing gcc builds
Diffstat (limited to 'indra/llrender')
-rw-r--r--indra/llrender/llglheaders.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llrender/llglheaders.h b/indra/llrender/llglheaders.h
index 851a75629e..b936fd30f8 100644
--- a/indra/llrender/llglheaders.h
+++ b/indra/llrender/llglheaders.h
@@ -520,6 +520,7 @@ extern PFNGLSAMPLEMASKIPROC glSampleMaski;
// windows gl headers depend on things like APIENTRY, so include windows.
#define WIN32_LEAN_AND_MEAN
+#define NOMINMAX
#include <winsock2.h>
#include <windows.h>