ECC Clean up.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6206 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdePkg/Include/Base.h b/MdePkg/Include/Base.h
index 4bc80c17c8459f36d41ff04855561fe0489465f0..fa6d0d5df22600e34b9c6c4ba37527cf6581a6d3 100644 (file)
--- a/MdePkg/Include/Base.h
+++ b/MdePkg/Include/Base.h
@@ -57,34 +57,18 @@ struct _LIST_ENTRY {
 // Modifiers for Data Types used to self document code.\r
 // This concept is borrowed for UEFI specification.\r
 //\r
-#ifndef IN\r
-//\r
-// Some other envirnments use this construct, so #ifndef to prevent\r
-// mulitple definition.\r
-//\r
 #define IN\r
 #define OUT\r
 #define OPTIONAL\r
-#endif\r
 \r
-//\r
-// Constants. They may exist in other build structures, so #ifndef them.\r
-//\r
-#ifndef TRUE\r
 //\r
 //  UEFI specification claims 1 and 0. We are concerned about the \r
 //  complier portability so we did it this way.\r
 //\r
 #define TRUE  ((BOOLEAN)(1==1))\r
-#endif\r
-\r
-#ifndef FALSE\r
 #define FALSE ((BOOLEAN)(0==1))\r
-#endif\r
 \r
-#ifndef NULL\r
 #define NULL  ((VOID *) 0)\r
-#endif\r
 \r
 #define  BIT0     0x00000001\r
 #define  BIT1     0x00000002\r
@@ -196,15 +180,11 @@ struct _LIST_ENTRY {
 //\r
 // Also support coding convention rules for var arg macros\r
 //\r
-#ifndef VA_START\r
-\r
 typedef CHAR8 *VA_LIST;\r
 #define VA_START(ap, v) (ap = (VA_LIST) & (v) + _INT_SIZE_OF (v))\r
 #define VA_ARG(ap, t)   (*(t *) ((ap += _INT_SIZE_OF (t)) - _INT_SIZE_OF (t)))\r
 #define VA_END(ap)      (ap = (VA_LIST) 0)\r
 \r
-#endif\r
-\r
 //\r
 // Macro that returns the byte offset of a field in a data structure. \r
 //\r

diff --git a/MdePkg/Include/IndustryStandard/AlertStandardFormatTable.h b/MdePkg/Include/IndustryStandard/AlertStandardFormatTable.h
index ebf0e7609ba5e01cd872ffff26171ed7dfa81819..0d7f539c9c2c938c65c46eb4a96377d9700430b5 100644 (file)
--- a/MdePkg/Include/IndustryStandard/AlertStandardFormatTable.h
+++ b/MdePkg/Include/IndustryStandard/AlertStandardFormatTable.h
@@ -11,8 +11,8 @@
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
 **/\r
 \r
-#ifndef _ALERT_STANDARD_FORMAT_TABLE_H\r
-#define _ALERT_STANDARD_FORMAT_TABLE_H\r
+#ifndef _ALERT_STANDARD_FORMAT_TABLE_H_\r
+#define _ALERT_STANDARD_FORMAT_TABLE_H_\r
 \r
 #include <IndustryStandard/Acpi.h>\r
 \r

diff --git a/MdePkg/Include/IndustryStandard/ElTorito.h b/MdePkg/Include/IndustryStandard/ElTorito.h
index d26200a80a1a4ac281570ade861ec9adc0b4a337..60b7a215231bb7b363275b63e2d3095c4fc39e5d 100644 (file)
--- a/MdePkg/Include/IndustryStandard/ElTorito.h
+++ b/MdePkg/Include/IndustryStandard/ElTorito.h
@@ -10,7 +10,7 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
 \r
---*/\r
+**/\r
 \r
 #ifndef _ELTORITO_H_\r
 #define _ELTORITO_H_\r

diff --git a/MdePkg/Include/IndustryStandard/Mbr.h b/MdePkg/Include/IndustryStandard/Mbr.h
index 937878f96f31bb4162706fc4714e6d9c8ebb5091..8dd9d59f267beac180816861d1f80350002180f1 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Mbr.h
+++ b/MdePkg/Include/IndustryStandard/Mbr.h
@@ -10,7 +10,7 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
 \r
---*/\r
+**/\r
 \r
 #ifndef _MBR_H_\r
 #define _MBR_H_\r

diff --git a/MdePkg/Include/IndustryStandard/Tpm12.h b/MdePkg/Include/IndustryStandard/Tpm12.h
index 32afb6bc07d264cd4fc9bc2f39f5171f8ef1db68..0c5fac2f9797db4c87477dca35bf70697e5af06f 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Tpm12.h
+++ b/MdePkg/Include/IndustryStandard/Tpm12.h
@@ -1121,9 +1121,6 @@ typedef struct tdTPM_AUDIT_EVENT_OUT {
 //\r
 // Part 2, section 16: Return Codes\r
 //\r
-#ifndef TPM_BASE\r
-#error "TPM Error Codes require definition of TPM_BASE"\r
-#endif\r
 \r
 #define TPM_VENDOR_ERROR            TPM_Vendor_Specific32\r
 #define TPM_NON_FATAL               0x00000800\r