#ifndef PRIx64
#if __WORDSIZE == 64
-#define __PRI64_PREFIX "l"
-#else
-#define __PRI64_PREFIX "L"
-#endif
+#define PRId64 "I64d"
+#define PRIx64 "I64x"
+#define PRIo64 "I64o"
+#define PRIu64 "I64u"
+#else // __WORDSIZE
+#define PRId64 "I64d"
+#define PRIx64 "I64x"
+#define PRIo64 "I64o"
+#define PRIu64 "I64u"
+
+#endif //__WORDSIZE
+#endif // PRIx64
+
-#define PRId64 __PRI64_PREFIX"d"
-#define PRIo64 __PRI64_PREFIX"o"
-#define PRIu64 __PRI64_PREFIX"u"
-#define PRIx64 __PRI64_PREFIX"x"
-#endif
#define LOG_ENTRY_SIZE_MAX 4096
#define BUF_SIZE LOG_ENTRY_SIZE_MAX