diff options
| author | Richard Linden <none@none> | 2011-10-04 13:27:18 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-10-04 13:27:18 -0700 |
| commit | 00432563400bedb0c0e3f5991f170874bf633984 (patch) | |
| tree | 722ac74193c7bd5329eba16485d73b9b1d111dcf /indra/llrender/llglheaders.h | |
| parent | fc6c3fbe4271dcd9b64bdfd417514dc97ad7dd75 (diff) | |
| parent | 50c0447808f7041d5af5017c847a462e9599bdb5 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
Diffstat (limited to 'indra/llrender/llglheaders.h')
| -rw-r--r-- | indra/llrender/llglheaders.h | 1 |
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> |