libpci: hwdb: Remove ID_SUBSYSTEM and ID_GEN_SUBSYSTEM usage from pci_id_hwdb_lookup()

[pciutils.git] / lib / types.h

diff --git a/lib/types.h b/lib/types.h
index 7011252ed18f865d584262bcc6dbfa710fd0ae05..260c981c9397df323f50f8eb50ac0672c80d5ee7 100644 (file)
--- a/lib/types.h
+++ b/lib/types.h
@@ -1,25 +1,29 @@
 /*
  *     The PCI Library -- Types and Format Strings
  *
- *     Copyright (c) 1997--2017 Martin Mares <mj@ucw.cz>
+ *     Copyright (c) 1997--2022 Martin Mares <mj@ucw.cz>
  *
- *     Can be freely distributed and used under the terms of the GNU GPL.
+ *     Can be freely distributed and used under the terms of the GNU GPL v2+
+ *
+ *     SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include <sys/types.h>
+#include <stddef.h>
 
 #ifndef PCI_HAVE_Uxx_TYPES
 
 #ifdef PCI_OS_WINDOWS
-/* On Windows compilers, use <windef.h> */
-#include <windef.h>
+/* On Windows compilers, use <windows.h> */
+#include <windows.h>
 typedef BYTE u8;
 typedef WORD u16;
 typedef DWORD u32;
 typedef unsigned __int64 u64;
 #define PCI_U64_FMT_X "I64x"
+#define PCI_U64_FMT_U "I64u"
 
-#elif defined(PCI_HAVE_STDINT_H) || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
+#else
 /* Use standard types in C99 and newer */
 #include <stdint.h>
 #include <inttypes.h>
@@ -28,23 +32,7 @@ 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;
-
-/* u64 will be unsigned (long) long */
-#include <limits.h>
-#if ULONG_MAX > 0xffffffff
-typedef unsigned long u64;
-#define PCI_U64_FMT_X "lx"
-#else
-typedef unsigned long long u64;
-#define PCI_U64_FMT_X "llx"
-#endif
-
+#define PCI_U64_FMT_U PRIu64
 #endif
 
 #endif /* PCI_HAVE_Uxx_TYPES */
@@ -70,6 +58,10 @@ typedef u32 pciaddr_t;
 
 #if defined(__GNUC__) && __GNUC__ > 2
 #define PCI_PRINTF(x,y) __attribute__((format(printf, x, y)))
+#define PCI_NONRET __attribute((noreturn))
+#define PCI_PACKED __attribute((packed))
 #else
 #define PCI_PRINTF(x,y)
+#define PCI_NONRET
+#define PCI_PACKED
 #endif