Mercurial > hg > dmlib

changeset 2353:a1265a407524

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix / improve DM_PRI* constants generated for Windows 64bit platform.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 05 Dec 2019 01:22:17 +0200
parents 97910014169a
children 289b8ae493ab
files src/dmlib.h
diffstat 1 files changed, 30 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/src/dmlib.h	Thu Dec 05 01:21:42 2019 +0200
+++ b/src/dmlib.h	Thu Dec 05 01:22:17 2019 +0200
@@ -48,31 +48,40 @@
 // Do we have a valid arch?
 // If so, set some printf specifiers
 #if DM_ARCH == 32
-#  define DM_PRIu32        "u"
-#  define DM_PRId32        "d"
-#  define DM_PRIx32        "x"
+#  define DM_PRIu32          "u"
+#  define DM_PRId32          "d"
+#  define DM_PRIx32          "x"
 #  ifdef DM_WINDOWS
-#    define DM_PRIu64      "u"
-#    define DM_PRId64      "d"
-#    define DM_PRIx64      "x"
+#    define DM_PRIu64        "u"
+#    define DM_PRId64        "d"
+#    define DM_PRIx64        "x"
 #  else
-#    define DM_PRIu64      "llu"
-#    define DM_PRId64      "lld"
-#    define DM_PRIx64      "llx"
+#    define DM_PRIu64        "llu"
+#    define DM_PRId64        "lld"
+#    define DM_PRIx64        "llx"
 #  endif
-#  define DM_PRIu_SIZE_T   "u"
-#  define DM_PRId_SSIZE_T  "d"
-#  define DM_PRIx_SIZE_T   "x"
+#  define DM_PRIu_SIZE_T     "u"
+#  define DM_PRId_SSIZE_T    "d"
+#  define DM_PRIx_SIZE_T     "x"
 #elif DM_ARCH == 64
-#  define DM_PRIu32        "u"
-#  define DM_PRId32        "d"
-#  define DM_PRIx32        "x"
-#  define DM_PRIu64        "lu"
-#  define DM_PRId64        "ld"
-#  define DM_PRIx64        "lx"
-#  define DM_PRIu_SIZE_T   "lu"
-#  define DM_PRId_SSIZE_T  "ld"
-#  define DM_PRIx_SIZE_T   "lx"
+#  define DM_PRIu32          "u"
+#  define DM_PRId32          "d"
+#  define DM_PRIx32          "x"
+#  ifdef DM_WINDOWS
+#    define DM_PRIu64        "I64u"
+#    define DM_PRId64        "I64d"
+#    define DM_PRIx64        "I64x"
+#    define DM_PRIu_SIZE_T   "I64u"
+#    define DM_PRId_SSIZE_T  "I64d"
+#    define DM_PRIx_SIZE_T   "I64x"
+#  else
+#    define DM_PRIu64        "lu"
+#    define DM_PRId64        "ld"
+#    define DM_PRIx64        "lx"
+#    define DM_PRIu_SIZE_T   "lu"
+#    define DM_PRId_SSIZE_T  "ld"
+#    define DM_PRIx_SIZE_T   "lx"
+#  endif
 #else
 #  error Could not determine architecture (32/64bit), please define DM_ARCH=32 or 64
 #endif