From 0e7e330262c29fd995a3ac4ea88b135d90587d96 Mon Sep 17 00:00:00 2001 From: jljusten Date: Tue, 15 Jun 2010 02:45:51 +0000 Subject: EdkCompatibilityPkg IA32 EfiBind.h: Do not include stdint.h 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 --- .../Foundation/Include/Ia32/EfiBind.h | 57 ++++++++-------------- 1 file changed, 21 insertions(+), 36 deletions(-) (limited to 'EdkCompatibilityPkg') diff --git a/EdkCompatibilityPkg/Foundation/Include/Ia32/EfiBind.h b/EdkCompatibilityPkg/Foundation/Include/Ia32/EfiBind.h index 58ff6e2ae6..6f4205801d 100644 --- a/EdkCompatibilityPkg/Foundation/Include/Ia32/EfiBind.h +++ b/EdkCompatibilityPkg/Foundation/Include/Ia32/EfiBind.h @@ -173,44 +173,29 @@ Abstract: #endif -#if !defined(__GNUC__) && (__STDC_VERSION__ < 199901L) - // - // No ANSI C 2000 stdint.h integer width declarations, so define equivalents - // - - #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 -#else +#if defined(_MSC_EXTENSIONS) + // - // Use ANSI C 2000 stdint.h integer width declarations + // use Microsoft C complier dependent integer width types // - #include "stdint.h" + + 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 + 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 // -- cgit v1.2.3