From b39bca1d068e21f717344bb01da36a59fc181ea6 Mon Sep 17 00:00:00 2001 From: Piers Daniell Date: Sun, 1 Mar 2015 09:32:56 -0700 Subject: Add NOMINMAX and VC_EXTRALEAN to some windows files This avoids these headers leaking conflicting Windows symbols to non-Windows code. --- include/XCB/xcb_windefs.h | 1 + include/xglPlatform.h | 3 +++ 2 files changed, 4 insertions(+) diff --git a/include/XCB/xcb_windefs.h b/include/XCB/xcb_windefs.h index df6026da..3f5c4b01 100644 --- 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 #include #include diff --git a/include/xglPlatform.h b/include/xglPlatform.h index aff2e5b3..fcd3d591 100644 --- 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 -- cgit v1.2.3