Add PRIX64, as we now use it.

svn path=/trunk/; revision=15811
network-analytics · Sep 15, 2005 · 3808fc0 · 3808fc0
1 parent 0060eaf
commit 3808fc0
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/acinclude.m4 b/acinclude.m4
@@ -125,7 +125,8 @@ AC_DEFUN([AC_ETHEREAL_CHECK_64BIT_FORMAT],
     [
       AC_DEFINE(PRId64, "$1d", [Format for printing 64-bit signed decimal numbers])
       AC_DEFINE(PRIo64, "$1o", [Format for printing 64-bit unsigned octal numbers])
-      AC_DEFINE(PRIx64, "$1x", [Format for printing 64-bit unsigned hexadecimal numbers])
+      AC_DEFINE(PRIx64, "$1x", [Format for printing 64-bit unsigned hexadecimal numbers (lower-case)])
+      AC_DEFINE(PRIX64, "$1X", [Format for printing 64-bit unsigned hexadecimal numbers (upper-case)])
       AC_DEFINE(PRIu64, "$1u", [Format for printing 64-bit unsigned decimal numbers])
       AC_MSG_RESULT(yes)
     ],

diff --git a/config.h.win32 b/config.h.win32
@@ -163,14 +163,22 @@
 #endif /* _MSC_EXTENSIONS */
 #endif /* PRIu64 */
 
-/* Format for printing 64-bit unsigned hexadecimal numbers */
-#ifndef PRIx64  
+/* Formats for printing 64-bit unsigned hexadecimal numbers */
+#ifndef PRIx64
 #ifdef _MSC_EXTENSIONS
 #define PRIx64  "I64x"
 #else /* _MSC_EXTENSIONS */
 #define PRIx64  "llx"
 #endif /* _MSC_EXTENSIONS */
-#endif /* PRIx64 */   
+#endif /* PRIx64 */
+
+#ifndef PRIX64
+#ifdef _MSC_EXTENSIONS
+#define PRIX64  "I64X"
+#else /* _MSC_EXTENSIONS */
+#define PRIX64  "llX"
+#endif /* _MSC_EXTENSIONS */
+#endif /* PRIX64 */
 
 /* Define if you have the z library (-lz).  */
 @HAVE_LIBZ@

diff --git a/configure.in b/configure.in
@@ -463,6 +463,7 @@ AC_CHECK_HEADERS(inttypes.h,
 	      printf("%" PRId64 "\n", (gint64)1);
 	      printf("%" PRIo64 "\n", (guint64)1);
 	      printf("%" PRIx64 "\n", (guint64)1);
+	      printf("%" PRIX64 "\n", (guint64)1);
 	      printf("%" PRIu64 "\n", (guint64)1);
 	    }
 	  ]])