diff options
author | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-08-17 12:18:07 +0200 |
---|---|---|
committer | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-08-17 12:18:07 +0200 |
commit | 70a4ca5bc196676e8926028b2187fe7bd2874d42 (patch) | |
tree | 38056355c35459c35802f93eca974a20a07d4623 /source/Globals.h | |
parent | MCServer should run just fine on Android now :D (diff) | |
download | cuberite-70a4ca5bc196676e8926028b2187fe7bd2874d42.tar cuberite-70a4ca5bc196676e8926028b2187fe7bd2874d42.tar.gz cuberite-70a4ca5bc196676e8926028b2187fe7bd2874d42.tar.bz2 cuberite-70a4ca5bc196676e8926028b2187fe7bd2874d42.tar.lz cuberite-70a4ca5bc196676e8926028b2187fe7bd2874d42.tar.xz cuberite-70a4ca5bc196676e8926028b2187fe7bd2874d42.tar.zst cuberite-70a4ca5bc196676e8926028b2187fe7bd2874d42.zip |
Diffstat (limited to 'source/Globals.h')
-rw-r--r-- | source/Globals.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/Globals.h b/source/Globals.h index 7d51bd52f..9ea0825c1 100644 --- a/source/Globals.h +++ b/source/Globals.h @@ -95,6 +95,11 @@ typedef short Int16; // 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 + #endif // GetFreeSpace #else #include <sys/types.h> #include <sys/stat.h> // for mkdir |