From: klu2 <klu2@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Wed, 26 May 2010 05:29:33 +0000 (+0000)
Subject: synchronize interget type definition from MdePkg's processbinding.h to make build... 
X-Git-Tag: edk2-stable201903~15801
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=5a2bc7144a6dd3954f5774aa4cb6d5a22ee46ab7

synchronize interget type definition from MdePkg's processbinding.h to make build pass under GCC44 tool chain

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 f0fd9d5243..3fba60ff5d 100644
--- 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
 // EFI intrinsics are required to modify thier member functions with EFIAPI.
 //
-#define EFIAPI  _EFIAPI
+#ifndef EFIAPI
+  #define EFIAPI  _EFIAPI
+#endif  
 
 //
 // EFI Constants. They may exist in other build structures, so #ifndef them.
diff --git a/EdkCompatibilityPkg/Foundation/Include/X64/EfiBind.h b/EdkCompatibilityPkg/Foundation/Include/X64/EfiBind.h
index 9b7b0cf6cd..9e582a71c8 100644
--- a/EdkCompatibilityPkg/Foundation/Include/X64/EfiBind.h
+++ b/EdkCompatibilityPkg/Foundation/Include/X64/EfiBind.h
@@ -128,45 +128,27 @@ Abstract:
 
 #endif
 
-
-#if !defined(__GNUC__) && (__STDC_VERSION__ < 199901L)
+#if defined(_MSC_EXTENSIONS)
   //
-  // No ANSI C 2000 stdint.h integer width declarations, so define equivalents
+  // use Microsoft C complier dependent integer width types 
   //
- 
-  #if _MSC_EXTENSIONS 
-    
-    //
-    // use Microsoft* C complier dependent interger width types 
-    //
-    typedef unsigned __int64    uint64_t;
-    typedef __int64             int64_t;
-    typedef unsigned __int32    uint32_t;
-    typedef __int32             int32_t;
-    typedef unsigned short      uint16_t;
-    typedef short               int16_t;
-    typedef unsigned char       uint8_t;
-    typedef char                int8_t;
-  #else
-
-    //
-    // Assume standard IA-32 alignment. 
-    // BugBug: Need to check portability of long long
-    //
-    typedef unsigned long long  uint64_t;
-    typedef long long           int64_t;
-    typedef unsigned int        uint32_t;
-    typedef int                 int32_t;
-    typedef unsigned short      uint16_t;
-    typedef short               int16_t;
-    typedef unsigned char       uint8_t;
-    typedef char                int8_t;
-  #endif
+  typedef unsigned __int64    uint64_t;
+  typedef __int64             int64_t;
+  typedef unsigned __int32    uint32_t;
+  typedef __int32             int32_t;
+  typedef unsigned short      uint16_t;
+  typedef short               int16_t;
+  typedef unsigned char       uint8_t;
+  typedef char                int8_t;
 #else
-  //
-  // Use ANSI C 2000 stdint.h integer width declarations
-  //
-  #include "stdint.h"
+  typedef unsigned long long  uint64_t;
+  typedef long long           int64_t;
+  typedef unsigned int        uint32_t;
+  typedef int                 int32_t;
+  typedef unsigned short      uint16_t;
+  typedef short               int16_t;
+  typedef unsigned char       uint8_t;
+  typedef char                int8_t;
 #endif
 
 //