From 4cb43192bd4a7b7eee05f5c33233459843636edb Mon Sep 17 00:00:00 2001 From: jljusten Date: Thu, 24 Apr 2008 16:21:53 +0000 Subject: Fix various warnings with the Intel C compiler. EfiBind.h: * Adding ignores for certain warnings with the Intel C compiler. (Partially merged from MdePkg.) EfiPxe.h: * Make sure PXE_NO_UINT64_SUPPORT is defined Decompress.c: * Removed 'unreachable' return statement. EdkCompatibilityPkg/**: (all other files) * Remove trailing comma from last value in enum. * Include instead of "EfiBind.h", or for some reason __STDC_VERSION__ is not defined. * Introduce more explicit function call ordering by storing results in local variables before using in a calculation. * Add some additional casting for BOOLEAN & UINT8 following calculations which change the type to 'int'. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5123 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Foundation/Include/Ebc/TianoBind.h | 2 +- EdkCompatibilityPkg/Foundation/Include/EfiCommon.h | 2 +- EdkCompatibilityPkg/Foundation/Include/EfiPxe.h | 6 +++- .../Foundation/Include/Ia32/TianoBind.h | 2 +- .../Foundation/Include/IndustryStandard/usb.h | 2 +- .../Foundation/Include/Ipf/TianoBind.h | 2 +- .../Foundation/Include/X64/EfiBind.h | 34 +++++++++++++++++++++- .../Foundation/Include/X64/TianoBind.h | 2 +- 8 files changed, 44 insertions(+), 8 deletions(-) (limited to 'EdkCompatibilityPkg/Foundation/Include') diff --git a/EdkCompatibilityPkg/Foundation/Include/Ebc/TianoBind.h b/EdkCompatibilityPkg/Foundation/Include/Ebc/TianoBind.h index 027d2478af..c1778824ec 100644 --- a/EdkCompatibilityPkg/Foundation/Include/Ebc/TianoBind.h +++ b/EdkCompatibilityPkg/Foundation/Include/Ebc/TianoBind.h @@ -23,7 +23,7 @@ Abstract: #ifndef _TIANO_BIND_H_ #define _TIANO_BIND_H_ -#include "EfiBind.h" +#include #define EFI_DXE_ENTRY_POINT(InitFunction) diff --git a/EdkCompatibilityPkg/Foundation/Include/EfiCommon.h b/EdkCompatibilityPkg/Foundation/Include/EfiCommon.h index 305bfeaf8a..63191fef3d 100644 --- a/EdkCompatibilityPkg/Foundation/Include/EfiCommon.h +++ b/EdkCompatibilityPkg/Foundation/Include/EfiCommon.h @@ -20,7 +20,7 @@ Abstract: #ifndef _EFI_COMMON_H_ #define _EFI_COMMON_H_ -#include "EfiBind.h" +#include #include "EfiTypes.h" #include "EfiStdArg.h" #include "EfiError.h" diff --git a/EdkCompatibilityPkg/Foundation/Include/EfiPxe.h b/EdkCompatibilityPkg/Foundation/Include/EfiPxe.h index 0ff2252469..623069e969 100644 --- a/EdkCompatibilityPkg/Foundation/Include/EfiPxe.h +++ b/EdkCompatibilityPkg/Foundation/Include/EfiPxe.h @@ -33,7 +33,11 @@ Abstract: // #define PXE_NETWORK_ORDER 1 // network order // #define PXE_UINT64_SUPPORT 1 // UINT64 supported -// #define PXE_NO_UINT64_SUPPORT 1 // UINT64 not supported +#if PXE_UINT64_SUPPORT == 0 +#define PXE_NO_UINT64_SUPPORT 1 +#else +#define PXE_NO_UINT64_SUPPORT 0 +#endif // #define PXE_BUSTYPE(a, b, c, d) \ ( \ diff --git a/EdkCompatibilityPkg/Foundation/Include/Ia32/TianoBind.h b/EdkCompatibilityPkg/Foundation/Include/Ia32/TianoBind.h index edf599a27f..60699c1099 100644 --- a/EdkCompatibilityPkg/Foundation/Include/Ia32/TianoBind.h +++ b/EdkCompatibilityPkg/Foundation/Include/Ia32/TianoBind.h @@ -23,7 +23,7 @@ Abstract: #ifndef _TIANO_BIND_H_ #define _TIANO_BIND_H_ -#include "EfiBind.h" +#include #ifdef EFI_DEBUG diff --git a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/usb.h b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/usb.h index f3858ed390..7ec33a1d36 100644 --- a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/usb.h +++ b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/usb.h @@ -160,7 +160,7 @@ enum { // //Use 200 ms to increase the error handling response time // - EFI_USB_INTERRUPT_DELAY = 2000000, + EFI_USB_INTERRUPT_DELAY = 2000000 }; diff --git a/EdkCompatibilityPkg/Foundation/Include/Ipf/TianoBind.h b/EdkCompatibilityPkg/Foundation/Include/Ipf/TianoBind.h index dc51e1d37e..de84156789 100644 --- a/EdkCompatibilityPkg/Foundation/Include/Ipf/TianoBind.h +++ b/EdkCompatibilityPkg/Foundation/Include/Ipf/TianoBind.h @@ -23,7 +23,7 @@ Abstract: #ifndef _TIANO_BIND_H_ #define _TIANO_BIND_H_ -#include "EfiBind.h" +#include #define EFI_DXE_ENTRY_POINT(InitFunction) diff --git a/EdkCompatibilityPkg/Foundation/Include/X64/EfiBind.h b/EdkCompatibilityPkg/Foundation/Include/X64/EfiBind.h index 349d79c675..52a223990d 100644 --- a/EdkCompatibilityPkg/Foundation/Include/X64/EfiBind.h +++ b/EdkCompatibilityPkg/Foundation/Include/X64/EfiBind.h @@ -37,6 +37,38 @@ Abstract: // #pragma pack() +#if __INTEL_COMPILER +// +// Disable ICC's warning: trailing comma is nonstandard +// +//#pragma warning ( disable : 271 ) + +// +// Disable ICC's warning: extra ";" ignored +// +#pragma warning ( disable : 424 ) + +// +// Disable ICC's warning: : variable "foo" was set but never used +// +#pragma warning ( disable : 593 ) + +// +// Disable ICC's remark #1418: external function definition with no prior declaration. +// This is legal ANSI C code so we disable the remark that is turned on with /W4 +// +#pragma warning ( disable : 1418 ) + + +// +// Disable ICC's remark #1419: external declaration in primary source file +// This is legal ANSI C code so we disable the remark that is turned on with /W4 +// +#pragma warning ( disable : 1419 ) + +#endif + + #if _MSC_EXTENSIONS // @@ -89,7 +121,7 @@ Abstract: #endif -#if (__STDC_VERSION__ < 199901L) +#if !defined(__GNUC__) && (__STDC_VERSION__ < 199901L) // // No ANSI C 2000 stdint.h integer width declarations, so define equivalents // diff --git a/EdkCompatibilityPkg/Foundation/Include/X64/TianoBind.h b/EdkCompatibilityPkg/Foundation/Include/X64/TianoBind.h index 45fe2119ac..006755c519 100644 --- a/EdkCompatibilityPkg/Foundation/Include/X64/TianoBind.h +++ b/EdkCompatibilityPkg/Foundation/Include/X64/TianoBind.h @@ -23,7 +23,7 @@ Abstract: #ifndef _TIANO_BIND_H_ #define _TIANO_BIND_H_ -#include "EfiBind.h" +#include #define EFI_DXE_ENTRY_POINT(InitFunction) -- cgit v1.2.3