Introduce standard macros for format specifiers

There exist standard macro definitions for the printf format specifiers. MS Visual Studio does not support that standard (at least not in older versions), so local definitions are needed there. Signed-off-by: Stefan Weil <[email protected]>
tesseract-ocr · May 11, 2017 · f2252fd · f2252fd
1 parent 2008daf
commit f2252fd
Showing 1 changed file with 18 additions and 3 deletions.
diff --git a/ccutil/host.h b/ccutil/host.h
@@ -68,7 +68,8 @@
 #undef max
 #endif
 
-#include <stdint.h>  // int32_t, ...
+#include <inttypes.h>            // PRId32, ...
+#include <stdint.h>              // int32_t, ...
 
 /********************************************************/
 /* __MAC__ */
@@ -111,8 +112,22 @@ typedef float FLOAT32;
 typedef double FLOAT64;
 typedef unsigned char BOOL8;
 
-#define INT32FORMAT "%d"
-#define INT64FORMAT "%lld"
+#if defined(_WIN32)
+
+/* MinGW defines the standard PRI... macros, but MSVS doesn't. */
+
+#if !defined(PRId32)
+# define PRId32 "d"
+#endif
+
+#if !defined(PRId64)
+# define PRId64 "I64d"
+#endif
+
+#endif /* _WIN32 */
+
+#define INT32FORMAT "%" PRId32
+#define INT64FORMAT "%" PRId64
 
 #define MAX_INT8  0x7f
 #define MAX_INT16 0x7fff