Merge remote-tracking branch 'mareko/r300g-draw-instanced' into pipe-video

[mesa.git] / src / glu / sgi / include / gluos.h

diff --git a/src/glu/sgi/include/gluos.h b/src/glu/sgi/include/gluos.h
index 8eaa7a153bd154c31b2323a0fa4c426dcccd8ab8..ac0a7874cece23f5eb96b021bc9738a3d7ee0814 100644 (file)
--- a/src/glu/sgi/include/gluos.h
+++ b/src/glu/sgi/include/gluos.h
@@ -40,7 +40,9 @@
 #define NOIME
 #define NOMINMAX
 
-#define _WIN32_WINNT 0x0400
+#ifndef _WIN32_WINNT
+  #define _WIN32_WINNT 0x0400
+#endif
 #ifndef STRICT
   #define STRICT 1
 #endif
@@ -48,14 +50,20 @@
 #include <windows.h>
 
 /* Disable warnings */
+#if defined(_MSC_VER)
 #pragma warning(disable : 4101)
 #pragma warning(disable : 4244)
 #pragma warning(disable : 4761)
+#endif
 
 #if defined(_MSC_VER) && _MSC_VER >= 1200 && _MSC_VER < 1300
 #pragma comment(linker, "/OPT:NOWIN98")
 #endif
 
+#ifndef WINGDIAPI
+#define WINGDIAPI
+#endif
+
 #elif defined(__OS2__)
 
 #include <stdlib.h>