diff options
| author | archshift <admin@archshift.com> | 2014-07-10 08:28:27 +0200 |
|---|---|---|
| committer | archshift <admin@archshift.com> | 2014-07-10 08:28:27 +0200 |
| commit | e824cd09b369c47a7f316fccc7577cd923164466 (patch) | |
| tree | d8efa178a29955525458a38b1351ea0b609a2a09 /src/Globals.h | |
| parent | EntityEffects.x -> EntityEffect.x, Object-Oriented effects (diff) | |
| parent | Merge pull request #1157 from Howaner/Window (diff) | |
| download | cuberite-e824cd09b369c47a7f316fccc7577cd923164466.tar cuberite-e824cd09b369c47a7f316fccc7577cd923164466.tar.gz cuberite-e824cd09b369c47a7f316fccc7577cd923164466.tar.bz2 cuberite-e824cd09b369c47a7f316fccc7577cd923164466.tar.lz cuberite-e824cd09b369c47a7f316fccc7577cd923164466.tar.xz cuberite-e824cd09b369c47a7f316fccc7577cd923164466.tar.zst cuberite-e824cd09b369c47a7f316fccc7577cd923164466.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/Globals.h | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/src/Globals.h b/src/Globals.h index e99333693..998676fb1 100644 --- a/src/Globals.h +++ b/src/Globals.h @@ -71,9 +71,24 @@ #define FORMATSTRING(formatIndex, va_argsIndex) __attribute__((format (printf, formatIndex, va_argsIndex))) - #define SIZE_T_FMT "%zu" - #define SIZE_T_FMT_PRECISION(x) "%" #x "zu" - #define SIZE_T_FMT_HEX "%zx" + #if defined(_WIN32) + // We're compiling on MinGW, which uses an old MSVCRT library that has no support for size_t printfing. + // We need direct size formats: + #if defined(_WIN64) + #define SIZE_T_FMT "%I64u" + #define SIZE_T_FMT_PRECISION(x) "%" #x "I64u" + #define SIZE_T_FMT_HEX "%I64x" + #else + #define SIZE_T_FMT "%u" + #define SIZE_T_FMT_PRECISION(x) "%" #x "u" + #define SIZE_T_FMT_HEX "%x" + #endif + #else + // We're compiling on Linux, so we can use libc's size_t printf format: + #define SIZE_T_FMT "%zu" + #define SIZE_T_FMT_PRECISION(x) "%" #x "zu" + #define SIZE_T_FMT_HEX "%zx" + #endif #define NORETURN __attribute((__noreturn__)) |