ECC Clean up.

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

5 files changed, 4 insertions, 27 deletions

diff --git a/MdePkg/Include/Base.h b/MdePkg/Include/Base.h
index 4bc80c17c8..fa6d0d5df2 100644
--- 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.

 // This concept is borrowed for UEFI specification.

 //

-#ifndef IN

-//

-// Some other envirnments use this construct, so #ifndef to prevent

-// mulitple definition.

-//

 #define IN

 #define OUT

 #define OPTIONAL

-#endif

 

 //

-// Constants. They may exist in other build structures, so #ifndef them.

-//

-#ifndef TRUE

-//

 //  UEFI specification claims 1 and 0. We are concerned about the 

 //  complier portability so we did it this way.

 //

 #define TRUE  ((BOOLEAN)(1==1))

-#endif

-

-#ifndef FALSE

 #define FALSE ((BOOLEAN)(0==1))

-#endif

 

-#ifndef NULL

 #define NULL  ((VOID *) 0)

-#endif

 

 #define  BIT0     0x00000001

 #define  BIT1     0x00000002

@@ -196,15 +180,11 @@ struct _LIST_ENTRY {
 //

 // Also support coding convention rules for var arg macros

 //

-#ifndef VA_START

-

 typedef CHAR8 *VA_LIST;

 #define VA_START(ap, v) (ap = (VA_LIST) & (v) + _INT_SIZE_OF (v))

 #define VA_ARG(ap, t)   (*(t *) ((ap += _INT_SIZE_OF (t)) - _INT_SIZE_OF (t)))

 #define VA_END(ap)      (ap = (VA_LIST) 0)

 

-#endif

-

 //

 // Macro that returns the byte offset of a field in a data structure. 

 //

diff --git a/MdePkg/Include/IndustryStandard/AlertStandardFormatTable.h b/MdePkg/Include/IndustryStandard/AlertStandardFormatTable.h
index ebf0e7609b..0d7f539c9c 100644
--- 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.             

 **/

 

-#ifndef _ALERT_STANDARD_FORMAT_TABLE_H

-#define _ALERT_STANDARD_FORMAT_TABLE_H

+#ifndef _ALERT_STANDARD_FORMAT_TABLE_H_

+#define _ALERT_STANDARD_FORMAT_TABLE_H_

 

 #include <IndustryStandard/Acpi.h>

 

diff --git a/MdePkg/Include/IndustryStandard/ElTorito.h b/MdePkg/Include/IndustryStandard/ElTorito.h
index d26200a80a..60b7a21523 100644
--- 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,                     

 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

 

---*/

+**/

 

 #ifndef _ELTORITO_H_

 #define _ELTORITO_H_

diff --git a/MdePkg/Include/IndustryStandard/Mbr.h b/MdePkg/Include/IndustryStandard/Mbr.h
index 937878f96f..8dd9d59f26 100644
--- 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,                     

 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

 

---*/

+**/

 

 #ifndef _MBR_H_

 #define _MBR_H_

diff --git a/MdePkg/Include/IndustryStandard/Tpm12.h b/MdePkg/Include/IndustryStandard/Tpm12.h
index 32afb6bc07..0c5fac2f97 100644
--- a/MdePkg/Include/IndustryStandard/Tpm12.h
+++ b/MdePkg/Include/IndustryStandard/Tpm12.h
@@ -1121,9 +1121,6 @@ typedef struct tdTPM_AUDIT_EVENT_OUT {
 //

 // Part 2, section 16: Return Codes

 //

-#ifndef TPM_BASE

-#error "TPM Error Codes require definition of TPM_BASE"

-#endif

 

 #define TPM_VENDOR_ERROR            TPM_Vendor_Specific32

 #define TPM_NON_FATAL               0x00000800