types.h: Provide u64 on all systems

Recent changes in lspci.c require u64 to be present regardless
of PCI_HAVE_64BIT_ADDRESS.

diff --git a/lib/types.h b/lib/types.h
index 4d23e692b8547fb5364f88ef91902edfcc38a30d..7011252ed18f865d584262bcc6dbfa710fd0ae05 100644 (file)
--- 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"

diff --git a/lspci.c b/lspci.c
index 3aeaf46e4b431a0ea92117520ae392c1cb2d3b19..c6f150006d7e57c07ec42b9c4671423cc32f02d3 100644 (file)
--- a/lspci.c
+++ b/lspci.c
@@ -359,7 +359,7 @@ show_range(char *prefix, u64 base, u64 limit, int is_64bit)
 
   printf("%s: ", prefix);
   if (is_64bit)
-    printf("%016" PCI_U64_FMT "x-%016" PCI_U64_FMT "x", base, limit);
+    printf("%016" PCI_U64_FMT_X "-%016" PCI_U64_FMT_X, base, limit);
   else
     printf("%08x-%08x", (unsigned) base, (unsigned) limit);
   if (base <= limit)