Add NOMINMAX and VC_EXTRALEAN to some windows files

This avoids these headers leaking conflicting Windows symbols to
non-Windows code.

diff --git a/include/XCB/xcb_windefs.h b/include/XCB/xcb_windefs.h
index df6026d..3f5c4b0 100644 (file)
--- a/include/XCB/xcb_windefs.h
+++ b/include/XCB/xcb_windefs.h
@@ -31,6 +31,7 @@
 #define WINVER 0x0501 /* required for getaddrinfo/freeaddrinfo defined only for WinXP and above */
 #endif
 
+#define VC_EXTRALEAN
 #include <winsock2.h>
 #include <ws2tcpip.h>
 #include <windef.h>

diff --git a/include/xglPlatform.h b/include/xglPlatform.h
index aff2e5b..fcd3d59 100644 (file)
--- a/include/xglPlatform.h
+++ b/include/xglPlatform.h
@@ -40,6 +40,9 @@ extern "C"
 */
 
 #if defined(_WIN32)
+    // Ensure we don't pick up min/max macros from Winddef.h
+    #define NOMINMAX
+
     // On Windows, XGLAPI should equate to the __stdcall convention
     #define XGLAPI   __stdcall