From bb969c3cccae159049adc20b2e13a17556331aae Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Sat, 19 Apr 2014 09:42:03 -0700 Subject: [PATCH] Add a SZFMT macro for a size_t string formatter --- Alc/alcConfig.c | 4 ++-- OpenAL32/Include/alMain.h | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Alc/alcConfig.c b/Alc/alcConfig.c index 34cf4d8f..1cdd65b7 100644 --- a/Alc/alcConfig.c +++ b/Alc/alcConfig.c @@ -89,7 +89,7 @@ static int readline(FILE *f, char **output, size_t *maxlen) temp = realloc(*output, newmax); if(!temp) { - ERR("Failed to realloc %lu bytes from %lu!\n", newmax, *maxlen); + ERR("Failed to realloc "SZFMT" bytes from "SZFMT"!\n", newmax, *maxlen); return 0; } @@ -162,7 +162,7 @@ static char *expdup(const char *str) temp = realloc(output, newmax); if(!temp) { - ERR("Failed to realloc %lu bytes from %lu!\n", newmax, maxlen); + ERR("Failed to realloc "SZFMT" bytes from "SZFMT"!\n", newmax, maxlen); return output; } diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h index 8b66e4e7..44e36625 100644 --- a/OpenAL32/Include/alMain.h +++ b/OpenAL32/Include/alMain.h @@ -31,6 +31,15 @@ #endif #endif +#if defined(_WIN64) +#define SZFMT "%I64u" +#elif defined(_WIN32) +#define SZFMT "%d" +#else +#define SZFMT "%zu" +#endif + + #include "align.h" #include "atomic.h" #include "uintmap.h"