Second set of changes based on a review of the code comments in the Include directory...

[mirror_edk2.git] / MdePkg / Include / Ipf / ProcessorBind.h

diff --git a/MdePkg/Include/Ipf/ProcessorBind.h b/MdePkg/Include/Ipf/ProcessorBind.h
index 9e87d44bf40963d281b80148336178dc0f4eadcd..b8fca5e0142e9db63a8b856c3a765bbf04c55897 100644 (file)
--- a/MdePkg/Include/Ipf/ProcessorBind.h
+++ b/MdePkg/Include/Ipf/ProcessorBind.h
@@ -1,7 +1,7 @@
 /** @file\r
-  Processor or Compiler specific defines and types for Intel Itanium(TM).\r
+  Processor or Compiler specific defines and types for Intel Itanium(TM) processors.\r
 \r
-  Copyright (c) 2006, Intel Corporation<BR>\r
+  Copyright (c) 2006 - 2009, Intel Corporation<BR>\r
   All rights reserved. This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
@@ -17,7 +17,7 @@
 \r
 \r
 ///\r
-/// Define the processor type so other code can make processor based choices\r
+/// Define the processor type so other code can make processor-based choices\r
 ///\r
 #define MDE_CPU_IPF\r
 \r
@@ -28,7 +28,7 @@
 #pragma pack()\r
 \r
 \r
-#if __INTEL_COMPILER\r
+#if defined(__INTEL_COMPILER)\r
 //\r
 // Disable ICC's remark #869: "Parameter" was never referenced warning.\r
 // This is legal ANSI C code so we disable the remark that is turned on with -Wall\r
@@ -50,7 +50,7 @@
 #endif\r
 \r
 \r
-#if _MSC_EXTENSIONS\r
+#if defined(_MSC_EXTENSIONS)\r
 //\r
 // Disable warning that make it impossible to compile at /W4\r
 // This only works for Microsoft* tools\r
@@ -84,7 +84,7 @@
 \r
 //\r
 // Can not cast a function pointer to a data pointer. We need to do this on\r
-// IPF to get access to the PLABEL.\r
+// Itanium processors to get access to the PLABEL.\r
 //\r
 #pragma warning ( disable : 4514 )\r
 \r
@@ -101,14 +101,14 @@
 #endif\r
 \r
 \r
-#if (__STDC_VERSION__ < 199901L)\r
+#if !defined (__STDC_VERSION__) || (__STDC_VERSION__) < 199901L\r
   //\r
   // No ANSI C 2000 stdint.h integer width declarations, so define equivalents\r
   //\r
 \r
-  #if _MSC_EXTENSIONS\r
+  #if defined(_MSC_EXTENSIONS)\r
     //\r
-    // use Microsoft C complier dependent integer width types\r
+    // use Microsoft C compiler dependent integer width types\r
     //\r
 \r
     ///\r
@@ -158,7 +158,7 @@
     ///\r
     typedef char                INT8;\r
   #else\r
-    #ifdef _EFI_P64\r
+    #if defined(_EFI_P64)\r
       //\r
       // P64 - pointers being 64-bit and longs and ints are 32-bits.\r
       //\r
@@ -358,7 +358,11 @@ typedef INT64   INTN;
 // use the correct C calling convention. All protocol member functions and\r
 // EFI intrinsics are required to modify their member functions with EFIAPI.\r
 //\r
-#if _MSC_EXTENSIONS\r
+#ifdef EFIAPI\r
+  ///\r
+  /// If EFIAPI is already defined, then we use that definition.\r
+  ///\r
+#elif defined(_MSC_EXTENSIONS)\r
   ///\r
   /// Microsoft* compiler specific method for EFIAPI calling convension\r
   /// \r
@@ -372,7 +376,7 @@ typedef INT64   INTN;
 //  if the /OPT:REF linker option is used. We defined a macro as this is a\r
 //  a non standard extension\r
 //\r
-#if _MSC_EXTENSIONS\r
+#if defined(_MSC_EXTENSIONS)\r
   ///\r
   /// Remove global variable from the linked image if there are no references to \r
   /// it after all compiler and linker optimizations have been performed.\r
@@ -408,7 +412,7 @@ typedef struct {
 \r
 /**\r
   Return the pointer to the first instruction of a function given a function pointer.\r
-  For Itanium CPUs, all function calls are made through a PLABEL, so a pointer to a function \r
+  For Itanium processors, all function calls are made through a PLABEL, so a pointer to a function \r
   is actually a pointer to a PLABEL.  The pointer to the first instruction of the function \r
   is contained within the PLABEL.  This macro may be used to retrieve a pointer to the first \r
   instruction of a function independent of the CPU architecture being used.  This is very \r