diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2018-02-20 21:50:22 -0500 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2018-02-20 21:50:22 -0500 |
| commit | f6d7cfd710de1bf9d4f6eabab45570bc91941ee1 (patch) | |
| tree | 6aed4f8606e47c6ef21c5b1d8bbf7cafa694af6e /lib/win32/emu.h | |
| parent | c81b92946b58b90fe9679a476338e2d2dec8df67 (diff) | |
| parent | f28f88e5e72ba1499409047a9d6985eb312c0232 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'lib/win32/emu.h')
| -rw-r--r-- | lib/win32/emu.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/win32/emu.h b/lib/win32/emu.h index b8539bb6..91793004 100644 --- a/lib/win32/emu.h +++ b/lib/win32/emu.h @@ -18,7 +18,9 @@ #define EMU_INCLUDE // Need feature detection macros below -#ifdef _MSC_VER +#if defined BOX_CMAKE +# include "../common/BoxConfig.cmake.h" +#elif defined _MSC_VER # include "../common/BoxConfig-MSVC.h" # define NEED_BOX_VERSION_H #else @@ -39,8 +41,14 @@ #ifndef __MINGW32__ typedef unsigned int mode_t; typedef unsigned int pid_t; + typedef unsigned int uid_t; + typedef unsigned int gid_t; #endif +// Disable Windows' non-standard implementation of min() and max(): +// http://stackoverflow.com/a/5004874/648162 +#define NOMINMAX + // Windows headers #include <winsock2.h> |