diff options
| author | Martin Mares <mj@ucw.cz> | 2024-02-18 12:05:21 +0100 |
|---|---|---|
| committer | Martin Mares <mj@ucw.cz> | 2024-02-18 12:05:21 +0100 |
| commit | 0128c5b1bcefd305e64aa54546295fc6a174f08a (patch) | |
| tree | ec4d85f229957a33c60179c9a511027567c3a02d | |
| parent | a8798cb1a28fe9e8db23b0962a2d3abe03e4cfea (diff) | |
| download | pciutils-0128c5b1bcefd305e64aa54546295fc6a174f08a.tar.gz | |
Since we already require C99, we can rely on <stdint.h>
| -rwxr-xr-x | lib/configure | 2 | ||||
| -rw-r--r-- | lib/types.h | 21 |
2 files changed, 1 insertions, 22 deletions
diff --git a/lib/configure b/lib/configure index 2479def..6f4b6ca 100755 --- a/lib/configure +++ b/lib/configure @@ -97,7 +97,6 @@ case $sys in exit 1 ;; esac - echo >>$c '#define PCI_HAVE_STDINT_H' ;; freebsd*|kfreebsd*) echo_n " fbsd-device mem-ports ecam" @@ -201,7 +200,6 @@ case $sys in echo >>$c '#define PCI_HAVE_PM_INTEL_CONF' ;; esac - echo >>$c '#define PCI_HAVE_STDINT_H' ;; sylixos) echo >>$c '#define PCI_PATH_SYLIXOS_DEVICE "/proc/pci"' diff --git a/lib/types.h b/lib/types.h index 2004906..b06ee08 100644 --- a/lib/types.h +++ b/lib/types.h @@ -22,7 +22,7 @@ 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> @@ -32,25 +32,6 @@ typedef uint32_t u32; typedef uint64_t u64; #define PCI_U64_FMT_X PRIx64 #define PCI_U64_FMT_U PRIu64 - -#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" -#define PCI_U64_FMT_U "lu" -#else -typedef unsigned long long u64; -#define PCI_U64_FMT_X "llx" -#define PCI_U64_FMT_U "llu" -#endif - #endif #endif /* PCI_HAVE_Uxx_TYPES */ |