Merge branch 'master' of git://git.ucc.asn.au/tpg/acess2

[tpg/acess2.git] / Usermode / Libraries / libc.so_src / include_exp / inttypes.h

diff --git a/Usermode/Libraries/libc.so_src/include_exp/inttypes.h b/Usermode/Libraries/libc.so_src/include_exp/inttypes.h
index 0200aa6..05e6707 100644 (file)
--- a/Usermode/Libraries/libc.so_src/include_exp/inttypes.h
+++ b/Usermode/Libraries/libc.so_src/include_exp/inttypes.h
@@ -11,18 +11,25 @@
 #define _INTTYPES_H_
 
 #include <stdint.h>
+#include <limits.h>
 
-#define PRId64 "lld"
-#define PRIdLEAST64    "lld"
-#define PRIdFAST64     "lld"
+#if INT64_MAX == LONG_MAX
+# define _PRI64        "l"
+#else
+# define _PRI64        "ll"
+#endif
+
+#define PRId64 _PRI64"d"
+#define PRIdLEAST64    _PRI64"d"
+#define PRIdFAST64     _PRI64"d"
 #define PRIdMAX
 #define PRIdPTR
-#define PRIi64 "lli"
+#define PRIi64 _PRI64"i"
 #define PRIiLEAST64
 #define PRIiFAST64
 #define PRIiMAX
 #define PRIiPTR
 
-#define PRIx64 "llx"
+#define PRIx64 _PRI64"i"
 
 #endif