fixes #4753: added MXE-specific macros to properly print format speci…

…fiers PRIu32, PRIu64 and PRId64 (patch 3/5)
Warzone2100 · Feb 22, 2018 · 7436417 · 7436417
1 parent 066e900
commit 7436417
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 0 deletions.
diff --git a/lib/framework/debug.h b/lib/framework/debug.h
@@ -261,7 +261,11 @@ bool debug_enable_switch(const char *str);
  * Only outputs if debugging of part was formerly enabled with debug_enable_switch.
  */
 #define debug(part, ...) do { if (enabled_debug[part]) _debug(__LINE__, part, __FUNCTION__, __VA_ARGS__); } while(0)
+#ifdef WZ_CC_MINGW
+void _debug(int line, code_part part, const char *function, const char *str, ...) WZ_DECL_FORMAT(__MINGW_PRINTF_FORMAT, 4, 5);
+#else
 void _debug(int line, code_part part, const char *function, const char *str, ...) WZ_DECL_FORMAT(printf, 4, 5);
+#endif
 
 #define debugBacktrace(part, ...) do { if (enabled_debug[part]) { _debug(__LINE__, part, __FUNCTION__, __VA_ARGS__); _debugBacktrace(part); }} while(0)
 void _debugBacktrace(code_part part);

diff --git a/lib/framework/physfs_ext.h b/lib/framework/physfs_ext.h
@@ -96,7 +96,11 @@ static inline bool PHYSFS_readBEFloat(PHYSFS_file *file, float *val)
 	return (PHYSFS_readUBE32(file, readValue) != 0);
 }
 
+#ifdef WZ_CC_MINGW
+bool PHYSFS_printf(PHYSFS_file *file, const char *format, ...) WZ_DECL_FORMAT(__MINGW_PRINTF_FORMAT, 2, 3);
+#else
 bool PHYSFS_printf(PHYSFS_file *file, const char *format, ...) WZ_DECL_FORMAT(printf, 2, 3);
+#endif
 
 /**
  * @brief      fgets() implemented using PHYSFS.

diff --git a/lib/framework/types.h b/lib/framework/types.h
@@ -72,6 +72,7 @@ typedef signed   long long int64_t;
 # define UINT32_MAX             (4294967295U)
 #endif
 #else
+#define __USE_MINGW_ANSI_STDIO 1
 #include <stdint.h>		// MSVC 2010 does have those defined
 #endif
 #endif

diff --git a/lib/netplay/netplay.h b/lib/netplay/netplay.h
@@ -336,7 +336,12 @@ const char *messageTypeToString(unsigned messageType);
 
 /// Sync debugging. Only prints anything, if different players would print different things.
 #define syncDebug(...) do { _syncDebug(__FUNCTION__, __VA_ARGS__); } while(0)
+#ifdef WZ_CC_MINGW
+void _syncDebug(const char *function, const char *str, ...) WZ_DECL_FORMAT(__MINGW_PRINTF_FORMAT, 2, 3);
+#else
 void _syncDebug(const char *function, const char *str, ...) WZ_DECL_FORMAT(printf, 2, 3);
+#endif
+
 /// Faster than syncDebug. Make sure that str is a format string that takes ints only.
 void _syncDebugIntList(const char *function, const char *str, int *ints, size_t numInts);
 #define syncDebugBacktrace() do { _syncDebugBacktrace(__FUNCTION__); } while(0)