diff options
| author | Julian Laubstein <julianlaubstein@yahoo.de> | 2015-12-22 21:19:13 +0100 |
|---|---|---|
| committer | Julian Laubstein <julianlaubstein@yahoo.de> | 2015-12-22 21:19:13 +0100 |
| commit | 3389b234ae96f57518f994003d66ed219e5f9030 (patch) | |
| tree | ed777b22dce19a4914f4586f7a93c9c3721208b5 /Tools/ToLuaDoxy/Globals.h | |
| parent | Merge pull request #2790 from Gargaj/waterbottle (diff) | |
| parent | Removed offending tr1 references. (diff) | |
| download | cuberite-3389b234ae96f57518f994003d66ed219e5f9030.tar cuberite-3389b234ae96f57518f994003d66ed219e5f9030.tar.gz cuberite-3389b234ae96f57518f994003d66ed219e5f9030.tar.bz2 cuberite-3389b234ae96f57518f994003d66ed219e5f9030.tar.lz cuberite-3389b234ae96f57518f994003d66ed219e5f9030.tar.xz cuberite-3389b234ae96f57518f994003d66ed219e5f9030.tar.zst cuberite-3389b234ae96f57518f994003d66ed219e5f9030.zip | |
Diffstat (limited to 'Tools/ToLuaDoxy/Globals.h')
| -rw-r--r-- | Tools/ToLuaDoxy/Globals.h | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/Tools/ToLuaDoxy/Globals.h b/Tools/ToLuaDoxy/Globals.h index b9100a297..869cf0afd 100644 --- a/Tools/ToLuaDoxy/Globals.h +++ b/Tools/ToLuaDoxy/Globals.h @@ -9,17 +9,17 @@ // OS-dependent stuff: #ifdef _WIN32 #define WIN32_LEAN_AND_MEAN - + #define _WIN32_WINNT 0x501 // We want to target WinXP and higher - + #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 @@ -43,10 +43,6 @@ #include <semaphore.h> #include <errno.h> #include <fcntl.h> - - #if !defined(ANDROID_NDK) - #include <tr1/memory> - #endif #endif @@ -95,7 +91,3 @@ #define MiB * 1024 * 1024 #define ASSERT assert - - - - |