X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Ftypes.h;h=f7ab470c86b034528410c05f889b4fa1feb4b6eb;hb=dc01dd60affb4688453f8b7204af66246f0850db;hp=8f519d4f47bb12c9081acb4e1b6cfdd37d847ea4;hpb=70edf3491bad02d20c8ec83ded0e8f6a5f2ded35;p=pciutils.git

diff --git a/lib/types.h b/lib/types.h
index 8f519d4..f7ab470 100644
--- a/lib/types.h
+++ b/lib/types.h
@@ -1,7 +1,7 @@
 /*
  *	The PCI Library -- Types and Format Strings
  *
- *	Copyright (c) 1997--2004 Martin Mares <mj@ucw.cz>
+ *	Copyright (c) 1997--2007 Martin Mares <mj@ucw.cz>
  *
  *	Can be freely distributed and used under the terms of the GNU GPL.
  */
@@ -11,9 +11,15 @@
 #ifndef PCI_HAVE_Uxx_TYPES
 
 #ifdef PCI_OS_WINDOWS
-typedef unsigned __int8 u8;
-typedef unsigned __int16 u16;
-typedef unsigned __int32 u32;
+#include <windef.h>
+typedef BYTE u8;
+typedef WORD u16;
+typedef DWORD u32;
+#elif defined(PCI_HAVE_STDINT_H)
+#include <stdint.h>
+typedef uint8_t u8;
+typedef uint16_t u16;
+typedef uint32_t u32;
 #else
 typedef u_int8_t u8;
 typedef u_int16_t u16;
@@ -35,7 +41,7 @@ typedef unsigned long long u64;
 
 #ifdef PCI_HAVE_64BIT_ADDRESS
 typedef u64 pciaddr_t;
-#define PCIADDR_T_FMT "%016" 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;