X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Ftypes.h;h=7011252ed18f865d584262bcc6dbfa710fd0ae05;hb=623ed0e1afa959013f4d7e507dd12cb9e4811577;hp=3e0e5c32270df80a5102fc11ba68fed32e6445f9;hpb=cd3b0e3ed508f18874e2a8c907bf82a4b2be2584;p=pciutils.git

diff --git a/lib/types.h b/lib/types.h
index 3e0e5c3..7011252 100644
--- a/lib/types.h
+++ b/lib/types.h
@@ -1,7 +1,7 @@
 /*
  *	The PCI Library -- Types and Format Strings
  *
- *	Copyright (c) 1997--2008 Martin Mares <mj@ucw.cz>
+ *	Copyright (c) 1997--2017 Martin Mares <mj@ucw.cz>
  *
  *	Can be freely distributed and used under the terms of the GNU GPL.
  */
@@ -11,38 +11,48 @@
 #ifndef PCI_HAVE_Uxx_TYPES
 
 #ifdef PCI_OS_WINDOWS
+/* On Windows compilers, use <windef.h> */
 #include <windef.h>
 typedef BYTE u8;
 typedef WORD u16;
 typedef DWORD u32;
+typedef unsigned __int64 u64;
+#define PCI_U64_FMT_X "I64x"
+
 #elif defined(PCI_HAVE_STDINT_H) || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
+/* Use standard types in C99 and newer */
 #include <stdint.h>
+#include <inttypes.h>
 typedef uint8_t u8;
 typedef uint16_t u16;
 typedef uint32_t u32;
+typedef uint64_t u64;
+#define PCI_U64_FMT_X PRIx64
+
 #else
+/* Hope for POSIX types from <sys/types.h> */
 typedef u_int8_t u8;
 typedef u_int16_t u16;
 typedef u_int32_t u32;
-#endif
 
-#ifdef PCI_HAVE_64BIT_ADDRESS
+/* u64 will be unsigned (long) long */
 #include <limits.h>
 #if ULONG_MAX > 0xffffffff
 typedef unsigned long u64;
-#define PCI_U64_FMT "l"
+#define PCI_U64_FMT_X "lx"
 #else
 typedef unsigned long long u64;
-#define PCI_U64_FMT "ll"
+#define PCI_U64_FMT_X "llx"
 #endif
+
 #endif
 
 #endif	/* PCI_HAVE_Uxx_TYPES */
 
 #ifdef PCI_HAVE_64BIT_ADDRESS
 typedef u64 pciaddr_t;
-#define PCIADDR_T_FMT "%08" PCI_U64_FMT "x"
-#define PCIADDR_PORT_FMT "%04" PCI_U64_FMT "x"
+#define PCIADDR_T_FMT "%08" PCI_U64_FMT_X
+#define PCIADDR_PORT_FMT "%04" PCI_U64_FMT_X
 #else
 typedef u32 pciaddr_t;
 #define PCIADDR_T_FMT "%08x"
@@ -58,7 +68,7 @@ typedef u32 pciaddr_t;
 #define PCIIRQ_FMT "%d"
 #endif
 
-#ifdef __GNUC__
+#if defined(__GNUC__) && __GNUC__ > 2
 #define PCI_PRINTF(x,y) __attribute__((format(printf, x, y)))
 #else
 #define PCI_PRINTF(x,y)