diff options
| author | Piers Daniell <pdaniell@nvidia.com> | 2015-03-01 09:32:56 -0700 |
|---|---|---|
| committer | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-03-02 17:21:11 -0700 |
| commit | b39bca1d068e21f717344bb01da36a59fc181ea6 (patch) | |
| tree | efd3735a4c7477061b7b251c5c002d94003a23b4 | |
| parent | e7a46e6eb3a32a28f4e74a8b0e5cbeeae73acc1b (diff) | |
| download | usermoji-b39bca1d068e21f717344bb01da36a59fc181ea6.tar.xz | |
Add NOMINMAX and VC_EXTRALEAN to some windows files
This avoids these headers leaking conflicting Windows symbols to
non-Windows code.
| -rw-r--r-- | include/XCB/xcb_windefs.h | 1 | ||||
| -rw-r--r-- | include/xglPlatform.h | 3 |
2 files changed, 4 insertions, 0 deletions
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 <winsock2.h> #include <ws2tcpip.h> #include <windef.h> 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 |