]> git.proxmox.com Git - mirror_edk2.git/commitdiff
EdkCompatibilityPkg IA32 EfiBind.h: Do not include stdint.h
authorjljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524>
Tue, 15 Jun 2010 02:45:51 +0000 (02:45 +0000)
committerjljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524>
Tue, 15 Jun 2010 02:45:51 +0000 (02:45 +0000)
Merge from MdePkg/Include/Ia32/ProcessorBind.h.  Do not include
stdint.h.  Instead define the basic types ourselves.

This fixes a build issue with GCC on X64 Linux.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10584 6f19259b-4bc3-4df7-8a09-765794883524

EdkCompatibilityPkg/Foundation/Include/Ia32/EfiBind.h

index 58ff6e2ae69ce9e9c85ecf375adfdbe160348890..6f4205801d546458b5c05477e27106f2630e92a8 100644 (file)
@@ -173,44 +173,29 @@ Abstract:
 #endif\r
 \r
 \r
-#if !defined(__GNUC__) && (__STDC_VERSION__ < 199901L)\r
-  //\r
-  // No ANSI C 2000 stdint.h integer width declarations, so define equivalents\r
-  //\r
\r
-  #if _MSC_EXTENSIONS \r
-    \r
-    //\r
-    // use Microsoft* C complier dependent interger width types \r
-    //\r
-    typedef unsigned __int64    uint64_t;\r
-    typedef __int64             int64_t;\r
-    typedef unsigned __int32    uint32_t;\r
-    typedef __int32             int32_t;\r
-    typedef unsigned short      uint16_t;\r
-    typedef short               int16_t;\r
-    typedef unsigned char       uint8_t;\r
-    typedef char                int8_t;\r
-  #else\r
-\r
-    //\r
-    // Assume standard IA-32 alignment. \r
-    // BugBug: Need to check portability of long long\r
-    //\r
-    typedef unsigned long long  uint64_t;\r
-    typedef long long           int64_t;\r
-    typedef unsigned int        uint32_t;\r
-    typedef int                 int32_t;\r
-    typedef unsigned short      uint16_t;\r
-    typedef short               int16_t;\r
-    typedef unsigned char       uint8_t;\r
-    typedef char                int8_t;\r
-  #endif\r
-#else\r
+#if defined(_MSC_EXTENSIONS)\r
+\r
   //\r
-  // Use ANSI C 2000 stdint.h integer width declarations\r
+  // use Microsoft C complier dependent integer width types \r
   //\r
-  #include "stdint.h"\r
+\r
+  typedef unsigned __int64    uint64_t;\r
+  typedef __int64             int64_t;\r
+  typedef unsigned __int32    uint32_t;\r
+  typedef __int32             int32_t;\r
+  typedef unsigned short      uint16_t;\r
+  typedef short               int16_t;\r
+  typedef unsigned char       uint8_t;\r
+  typedef char                int8_t;\r
+#else  \r
+  typedef unsigned long long  uint64_t;\r
+  typedef long long           int64_t;\r
+  typedef unsigned int        uint32_t;\r
+  typedef int                 int32_t;\r
+  typedef unsigned short      uint16_t;\r
+  typedef short               int16_t;\r
+  typedef unsigned char       uint8_t;\r
+  typedef char                int8_t;\r
 #endif\r
 \r
 //\r