fixup

Author: MLopez-Ibanez

c/common.h

@@ -27,9 +27,6 @@ moocore_malloc(size_t nmemb, size_t size, const char *file, int line)
 #include <stdarg.h>
 #include <stdlib.h>
 #include <assert.h>
-#ifndef __USE_MINGW_ANSI_STDIO
-#define __USE_MINGW_ANSI_STDIO 1 // Add support for %zu in MinGW-w64's printf
-#endif
 #include <stdio.h>
 #include "gcc_attribs.h"
 #define Rprintf(...) printf(__VA_ARGS__)

c/gcc_attribs.h

@@ -4,13 +4,25 @@
 /* printf format-specifier for size_t */
 #if defined(_MSC_VER) && (_MSC_VER < 1800)  // MSVC before 2013
 #define PRIsize_t "Iu"
-#elif defined(__MINGW32__) && !defined(__USE_MINGW_ANSI_STDIO) && !defined(_UCRT)
-// MinGW-w64 with default MSVCRT runtime (without ANSI stdio)
-#define PRIsize_t "Iu"
+#elif defined(_UCRT)
+#define PRIsize_t "zu"  // Standard C99 format
+#elif defined(__MINGW32__) && defined(__USE_MINGW_ANSI_STDIO) && __USE_MINGW_ANSI_STDIO == 0
+#include <inttypes.h>
+#define PRIsize_t     PRIuPTR
 #else
 #define PRIsize_t "zu"  // Standard C99 format
 #endif
 
+#if defined(_UCRT)
+#pragma GCC warning "Using UCRT (Universal C Runtime)"
+#elif defined(__MINGW32__) && !defined(__USE_MINGW_ANSI_STDIO)
+#pragma GCC warning "Using MSVCRT (Default MinGW-w64 runtime)"
+#elif defined(__USE_MINGW_ANSI_STDIO)
+#pragma GCC warning "Using MinGW-w64's custom ANSI printf"
+#else
+#pragma GCC warning "Using standard C runtime\n"
+#endif
+
 /* FIXME: does this handle C++? */
 #ifndef __pure_func
 # define __pure_func	__attribute__((__pure__))