Since we already require C99, we can rely on <stdint.h>

diff --git a/lib/configure b/lib/configure
index 2479deff45c56660b1a692e287db347534daa787..6f4b6cac7e36d327fcec756d450245bf4ecb990d 100755 (executable)
--- 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 200490648bfed104a9a356f2de88e770ee64528c..b06ee08f86ccd3532907fc83a85136195fa5186a 100644 (file)
--- 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 */