diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2015-02-08 17:35:10 +0100 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2015-06-06 13:21:09 +0200 |
| commit | de5b1401f813985300c33c6b3166b115f9a10dd3 (patch) | |
| tree | 37c44a693a8b3402b8be7ddbcf9e52a8ea9882db /src/Globals.h | |
| parent | Merge pull request #2172 from mc-server/LightingCallbacks (diff) | |
| download | cuberite-de5b1401f813985300c33c6b3166b115f9a10dd3.tar cuberite-de5b1401f813985300c33c6b3166b115f9a10dd3.tar.gz cuberite-de5b1401f813985300c33c6b3166b115f9a10dd3.tar.bz2 cuberite-de5b1401f813985300c33c6b3166b115f9a10dd3.tar.lz cuberite-de5b1401f813985300c33c6b3166b115f9a10dd3.tar.xz cuberite-de5b1401f813985300c33c6b3166b115f9a10dd3.tar.zst cuberite-de5b1401f813985300c33c6b3166b115f9a10dd3.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/Globals.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/Globals.h b/src/Globals.h index 27d944fcc..8ff7b6894 100644 --- a/src/Globals.h +++ b/src/Globals.h @@ -192,14 +192,13 @@ template class SizeChecker<UInt8, 1>; #define WIN32_LEAN_AND_MEAN #define _WIN32_WINNT _WIN32_WINNT_WS03 // We want to target Windows XP with Service Pack 2 & Windows Server 2003 with Service Pack 1 and higher + // Windows SDK defines min and max macros, messing up with our std::min and std::max usage + #define NOMINMAX + #include <Windows.h> #include <winsock2.h> #include <Ws2tcpip.h> // IPv6 stuff - // Windows SDK defines min and max macros, messing up with our std::min and std::max usage - #undef min - #undef max - // Windows SDK defines GetFreeSpace as a constant, probably a Win16 API remnant #ifdef GetFreeSpace #undef GetFreeSpace |