Move format specifier macros to idlib/sys/sys_defines.h

neo/framework/Common.cpp

@@ -48,7 +48,7 @@ If you have questions concerning this license or the applicable additional terms
 
 #include "../sys/sys_savegame.h"
 
-#include "../portability/inttypes.h"
+#include "idlib/sys/sys_defines.h"
 
 #if defined( _DEBUG )
 #define BUILD_DEBUG "-debug"

neo/framework/File.cpp

@@ -31,7 +31,7 @@ If you have questions concerning this license or the applicable additional terms
 #pragma hdrstop
 
 #include "Unzip.h"
-#include "../portability/inttypes.h"
+#include "idlib/sys/sys_defines.h"
 
 /*
 =================

neo/framework/Zip.cpp

@@ -36,7 +36,7 @@ Contains external code for building ZipFiles.
 */
 
 #include "Zip.h"
-#include "../portability/inttypes.h"
+#include "idlib/sys/sys_defines.h"
 
 // #undef STDC
 

neo/idlib/sys/sys_defines.h

@@ -257,3 +257,22 @@ extern volatile int ignoredReturnValue;
 #define MIN_UNSIGNED_TYPE( x )	0
 
 #endif
+
+
+/*
+ * Macros for format conversion specifications for integer arguments of type
+ * size_t or ssize_t.
+ */
+#ifdef _MSV_VER
+
+#define PRIiSIZE "Ii"
+#define PRIuSIZE "Iu"
+#define PRIxSIZE "Ix"
+
+#else // ifdef _MSV_VER
+
+#define PRIiSIZE "zi"
+#define PRIuSIZE "zu"
+#define PRIxSIZE "zx"
+
+#endif // ifdef _MSV_VER

neo/libs/zlib/trees.c

@@ -35,7 +35,7 @@
 /* #define GEN_TREES_H */
 
 #include "deflate.h"
-#include "../portability/inttypes.h"
+#include "idlib/sys/sys_defines.h"
 
 #ifdef DEBUG
 #  include <ctype.h>

neo/portability/inttypes.h

@@ -1,13 +0,0 @@
-#pragma once
-
-#ifdef _MSV_VER
-
-#define PRIuSIZE "Iu"
-#define PRIxSIZE "Ix"
-
-#else // ifdef _MSV_VER
-
-#define PRIuSIZE "zu"
-#define PRIxSIZE "zx"
-
-#endif // ifdef _MSV_VER