X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Ftypes.h;h=260c981c9397df323f50f8eb50ac0672c80d5ee7;hb=9f3d614e4578bdec2b60d97caec400b28d4af9d3;hp=200490648bfed104a9a356f2de88e770ee64528c;hpb=6182921907ef3cc31be3394eb468b24bcd3955a8;p=pciutils.git diff --git a/lib/types.h b/lib/types.h index 2004906..260c981 100644 --- a/lib/types.h +++ b/lib/types.h @@ -9,6 +9,7 @@ */ #include +#include #ifndef PCI_HAVE_Uxx_TYPES @@ -22,7 +23,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 #include @@ -32,25 +33,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 */ -typedef u_int8_t u8; -typedef u_int16_t u16; -typedef u_int32_t u32; - -/* u64 will be unsigned (long) long */ -#include -#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 */