diff --git a/MdePkg/Include/Ia32/ProcessorBind.h b/MdePkg/Include/Ia32/ProcessorBind.h index 61273e624c..2dccac4eb0 100644 --- a/MdePkg/Include/Ia32/ProcessorBind.h +++ b/MdePkg/Include/Ia32/ProcessorBind.h @@ -27,6 +27,23 @@ #pragma pack() #endif +#if __INTEL_COMPILER +// +// 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 // diff --git a/MdePkg/Include/Ipf/ProcessorBind.h b/MdePkg/Include/Ipf/ProcessorBind.h index a383868fc6..fdc0a4dd3b 100644 --- a/MdePkg/Include/Ipf/ProcessorBind.h +++ b/MdePkg/Include/Ipf/ProcessorBind.h @@ -28,28 +28,29 @@ #pragma pack() -#if _MSC_EXTENSIONS - -// -// Disable warning that make it impossible to compile at /W4 -// This only works for Microsoft tools. Copied from the -// IA-32 version of efibind.h -// - #if __INTEL_COMPILER // -// Disable ICC's error #1418: external function definition with no prior declaration +// 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 error #1419: external declaration in primary source file +// 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 +// +// Disable warning that make it impossible to compile at /W4 +// This only works for Microsoft tools. +// + // // Disabling bitfield type checking warnings. // diff --git a/MdePkg/Include/x64/ProcessorBind.h b/MdePkg/Include/x64/ProcessorBind.h index d0c02c3474..a4a1a35e35 100644 --- a/MdePkg/Include/x64/ProcessorBind.h +++ b/MdePkg/Include/x64/ProcessorBind.h @@ -28,6 +28,24 @@ #pragma pack() #endif + +#if __INTEL_COMPILER +// +// 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 //