synchronize interget type definition from MdePkg's processbinding.h to make build...

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

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Include/EfiTypes.h b/EdkCompatibilityPkg/Foundation/Efi/Include/EfiTypes.h
index f0fd9d5243da0458ae3d63952e9fe57ef415f7f4..3fba60ff5d156607d589b2e4ed11c7d29be6c531 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Efi/Include/EfiTypes.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Include/EfiTypes.h
@@ -82,7 +82,9 @@ typedef UINT64 EFI_LBA;
 // use the correct C calling convention. All protocol member functions and\r
 // EFI intrinsics are required to modify thier member functions with EFIAPI.\r
 //\r
-#define EFIAPI  _EFIAPI\r
+#ifndef EFIAPI\r
+  #define EFIAPI  _EFIAPI\r
+#endif  \r
 \r
 //\r
 // EFI Constants. They may exist in other build structures, so #ifndef them.\r

diff --git a/EdkCompatibilityPkg/Foundation/Include/X64/EfiBind.h b/EdkCompatibilityPkg/Foundation/Include/X64/EfiBind.h
index 9b7b0cf6cd332e469a6bc33d58affb3966eaed51..9e582a71c8b0c6b8d6136569ff163c2318d2c6ad 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Include/X64/EfiBind.h
+++ b/EdkCompatibilityPkg/Foundation/Include/X64/EfiBind.h
@@ -128,45 +128,27 @@ Abstract:
 \r
 #endif\r
 \r
-\r
-#if !defined(__GNUC__) && (__STDC_VERSION__ < 199901L)\r
+#if defined(_MSC_EXTENSIONS)\r
   //\r
-  // No ANSI C 2000 stdint.h integer width declarations, so define equivalents\r
+  // use Microsoft C complier dependent integer width types \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
+  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
-  // Use ANSI C 2000 stdint.h integer width declarations\r
-  //\r
-  #include "stdint.h"\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