Move the PRI[doux]64 definitions to pcap-types.h.

[libpcap] / pcap-types.h

diff --git a/pcap-types.h b/pcap-types.h
index bb264c3e0bee01638edffe08e48a48bd3173eb15..f1ec44841717ed14a445e22701b95feb8ac26559 100644 (file)
--- a/pcap-types.h
+++ b/pcap-types.h
@@ -93,6 +93,50 @@
       #endif
     #endif
   #endif
+
+  /*
+   * These may be defined by <inttypes.h>.
+   *
+   * XXX - for MSVC, we always want the _MSC_EXTENSIONS versions.
+   * What about other compilers?  If, as the MinGW Web site says MinGW
+   * does, the other compilers just use Microsoft's run-time library,
+   * then they should probably use the _MSC_EXTENSIONS even if the
+   * compiler doesn't define _MSC_EXTENSIONS.
+   *
+   * XXX - we currently aren't using any of these, but this allows
+   * their use in the future.
+   */
+  #ifndef PRId64
+    #ifdef _MSC_EXTENSIONS
+      #define PRId64   "I64d"
+    #else
+      #define PRId64   "lld"
+    #endif
+  #endif /* PRId64 */
+
+  #ifndef PRIo64
+    #ifdef _MSC_EXTENSIONS
+      #define PRIo64   "I64o"
+    #else
+      #define PRIo64   "llo"
+    #endif
+  #endif /* PRIo64 */
+
+  #ifndef PRIx64
+    #ifdef _MSC_EXTENSIONS
+      #define PRIx64   "I64x"
+    #else
+      #define PRIx64   "llx"
+    #endif
+  #endif
+
+  #ifndef PRIu64
+    #ifdef _MSC_EXTENSIONS
+      #define PRIu64   "I64u"
+    #else
+      #define PRIu64   "llu"
+    #endif
+  #endif
 #elif defined(__MINGW32__)
   /*
    * Target is Windows, compiler is MinGW.