diff options
| author | Alexander Harkness <me@bearbin.net> | 2015-06-09 10:15:08 +0200 |
|---|---|---|
| committer | Alexander Harkness <me@bearbin.net> | 2015-06-09 10:15:08 +0200 |
| commit | 1e77f271916ee1d1ee8c0047234662c29d2057bc (patch) | |
| tree | 85cc42b6f276ff368ed70cc6e50d7000807652c7 /src/Globals.h | |
| parent | Merge pull request #2221 from mc-server/AreaCountBlocks (diff) | |
| parent | Added moar comments (diff) | |
| download | cuberite-1e77f271916ee1d1ee8c0047234662c29d2057bc.tar cuberite-1e77f271916ee1d1ee8c0047234662c29d2057bc.tar.gz cuberite-1e77f271916ee1d1ee8c0047234662c29d2057bc.tar.bz2 cuberite-1e77f271916ee1d1ee8c0047234662c29d2057bc.tar.lz cuberite-1e77f271916ee1d1ee8c0047234662c29d2057bc.tar.xz cuberite-1e77f271916ee1d1ee8c0047234662c29d2057bc.tar.zst cuberite-1e77f271916ee1d1ee8c0047234662c29d2057bc.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 4c9091e85..b787a94da 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 |