Updates

src/drivers/libretro/libretro-common/include/retro_common_api.h

@@ -25,14 +25,14 @@
 
 /*
 This file is designed to normalize the libretro-common compiling environment
-for public API headers. This should be leaner than a normal compiling environment, 
+for public API headers. This should be leaner than a normal compiling environment,
 since it gets #included into other project's sources.
 */
 
 /* ------------------------------------ */
 
 /*
-Ordinarily we want to put #ifdef __cplusplus extern "C" in C library 
+Ordinarily we want to put #ifdef __cplusplus extern "C" in C library
 headers to enable them to get used by c++ sources.
 However, we want to support building this library as C++ as well, so a
 special technique is called for.
@@ -75,19 +75,29 @@ typedef int ssize_t;
 #include <sys/types.h>
 #endif
 
-#ifdef _WIN32
-#define STRING_REP_INT64  "%I64u"
-#define STRING_REP_UINT64 "%I64u"
-#define STRING_REP_ULONG  "%Iu"
-#elif defined(__STDC_VERSION__) && __STDC_VERSION__>=199901L && !defined(VITA) && !defined(WIIU)
-#define STRING_REP_INT64  "%llu"
-#define STRING_REP_UINT64 "%llu"
-#define STRING_REP_ULONG  "%zu"
+#ifdef _MSC_VER
+#if _MSC_VER >= 1800
+#include <inttypes.h>
 #else
-#define STRING_REP_INT64  "%llu"
-#define STRING_REP_UINT64 "%llu"
-#define STRING_REP_ULONG  "%lu"
+#ifndef PRId64
+#define PRId64 "I64d"
+#define PRIu64 "I64u"
+#define PRIuPTR "Iu"
 #endif
+#endif
+#else
+/* C++11 says this one isn't needed, but apparently (some versions of) mingw require it anyways */
+/* https://stackoverflow.com/questions/8132399/how-to-printf-uint64-t-fails-with-spurious-trailing-in-format */
+/* https://github.com/libretro/RetroArch/issues/6009 */
+#define __STDC_FORMAT_MACROS
+#include <inttypes.h>
+#endif
+#ifndef PRId64
+#error "inttypes.h is being screwy"
+#endif
+#define STRING_REP_INT64 "%" PRId64
+#define STRING_REP_UINT64 "%" PRIu64
+#define STRING_REP_USIZE "%" PRIuPTR
 
 /*
 I would like to see retro_inline.h moved in here; possibly boolean too.