fix for bug #1025: It should be no longer necessary to use the I64x format string...

The real cause of this: There's a bug in GLib's snprintf implementation which crashes with the I64x format string and certain (negative?) values.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@18883 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/config.h.win32 b/config.h.win32
index a2e8aac0b859b8fe67ef1386be157479b9ab8e94..f4f2e8a0d740c38a4f74da2e3ed6c6c5b4598dbf 100644 (file)
--- a/config.h.win32
+++ b/config.h.win32
@@ -167,9 +167,14 @@
 #endif /* PRIu64 */
 
 /* Formats for printing 64-bit unsigned hexadecimal numbers */
+/* XXX - it seems that GLib has problems with the MSVC like I64x.
+   As we use GLib's g_sprintf and alike, it should be safe to use
+   llx everywhere now, making the macros pretty useless. For details see:
+   http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1025 */
 #ifndef PRIx64
 #ifdef _MSC_EXTENSIONS
-#define PRIx64  "I64x"
+/*#define PRIx64  "I64x"*/
+#define PRIx64  "llx"
 #else /* _MSC_EXTENSIONS */
 #define PRIx64  "llx"
 #endif /* _MSC_EXTENSIONS */
@@ -177,7 +182,8 @@
 
 #ifndef PRIX64
 #ifdef _MSC_EXTENSIONS
-#define PRIX64  "I64X"
+/*#define PRIX64  "I64X"*/
+#define PRIX64  "llX"
 #else /* _MSC_EXTENSIONS */
 #define PRIX64  "llX"
 #endif /* _MSC_EXTENSIONS */