Remove some unnecessary #if/#ifdef from some header files.

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

diff --git a/EdkModulePkg/Include/Protocol/UgaIo.h b/EdkModulePkg/Include/Protocol/UgaIo.h
index 91ff8df35a3ad72156752aea1d4908acc21d1a4d..561dafd0986a432d0b579d9ad4f67e434b98c70e 100644 (file)
--- a/EdkModulePkg/Include/Protocol/UgaIo.h
+++ b/EdkModulePkg/Include/Protocol/UgaIo.h
@@ -63,7 +63,6 @@ typedef struct _UGA_DEVICE {
 }\r
 UGA_DEVICE, *PUGA_DEVICE;\r
 \r
-#ifndef UGA_IO_REQUEST_CODE\r
 //\r
 // Prevent conflicts with UGA typedefs.\r
 //\r
@@ -94,8 +93,6 @@ typedef enum {
 }\r
 UGA_IO_REQUEST_CODE, *PUGA_IO_REQUEST_CODE;\r
 \r
-#endif\r
-\r
 typedef struct {\r
   IN UGA_IO_REQUEST_CODE  ioRequestCode;\r
   IN VOID                 *pvInBuffer;\r

diff --git a/EdkModulePkg/Library/EdkGenericPlatformBdsLib/BootMaint/BootMaint.h b/EdkModulePkg/Library/EdkGenericPlatformBdsLib/BootMaint/BootMaint.h
index 6c3489f26945d8a203844c5d68fa8aa9d78a7692..a5c9f0d920f14ab37055b2780cc8db2ba367ff7a 100644 (file)
--- a/EdkModulePkg/Library/EdkGenericPlatformBdsLib/BootMaint/BootMaint.h
+++ b/EdkModulePkg/Library/EdkGenericPlatformBdsLib/BootMaint/BootMaint.h
@@ -85,16 +85,14 @@ Revision History
 // Check to see if current build support option active feature of\r
 // some driver option\r
 //\r
-#ifndef LOAD_OPTION_ACTIVE\r
 #define LOAD_OPTION_ACTIVE  0x00000001\r
-#endif\r
+\r
 //\r
 // Check to see if current build support force reconnect feature of\r
 // some driver option\r
 //\r
-#ifndef LOAD_OPTION_FORCE_RECONNECT\r
 #define LOAD_OPTION_FORCE_RECONNECT 0x00000002\r
-#endif\r
+\r
 //\r
 // Below are the form ids for display, form id is used as callback key value,\r
 // some key value definitions are also defined here. By defining this enum type,\r

diff --git a/EdkModulePkg/Library/EdkGenericPlatformBdsLib/Language.h b/EdkModulePkg/Library/EdkGenericPlatformBdsLib/Language.h
index 6b6d887040aad12469415b2a01f994ed8af9c7a2..a7c32ece0ef642e6fb2095ed0afe7915992c0bba 100644 (file)
--- a/EdkModulePkg/Library/EdkGenericPlatformBdsLib/Language.h
+++ b/EdkModulePkg/Library/EdkGenericPlatformBdsLib/Language.h
@@ -24,9 +24,7 @@ Revision History
 #ifndef _LANGUAGE_H\r
 #define _LANGUAGE_H\r
 \r
-#ifndef ISO_639_2_ENTRY_SIZE\r
 #define ISO_639_2_ENTRY_SIZE  3\r
-#endif\r
 \r
 VOID\r
 InitializeLanguage (\r

diff --git a/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/BootMaint.h b/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/BootMaint.h
index d2a3e3d30e674923d530562fd89227dd30ef2f41..13fd28140eddeeb122c7af5376eec1b200ba8ef8 100644 (file)
--- a/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/BootMaint.h
+++ b/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/BootMaint.h
@@ -85,16 +85,14 @@ Revision History
 // Check to see if current build support option active feature of\r
 // some driver option\r
 //\r
-#ifndef LOAD_OPTION_ACTIVE\r
 #define LOAD_OPTION_ACTIVE  0x00000001\r
-#endif\r
+\r
 //\r
 // Check to see if current build support force reconnect feature of\r
 // some driver option\r
 //\r
-#ifndef LOAD_OPTION_FORCE_RECONNECT\r
 #define LOAD_OPTION_FORCE_RECONNECT 0x00000002\r
-#endif\r
+\r
 //\r
 // Below are the form ids for display, form id is used as callback key value,\r
 // some key value definitions are also defined here. By defining this enum type,\r

diff --git a/EdkNt32Pkg/Dxe/PlatformBds/Generic/Language.h b/EdkNt32Pkg/Dxe/PlatformBds/Generic/Language.h
index 6b6d887040aad12469415b2a01f994ed8af9c7a2..a7c32ece0ef642e6fb2095ed0afe7915992c0bba 100644 (file)
--- a/EdkNt32Pkg/Dxe/PlatformBds/Generic/Language.h
+++ b/EdkNt32Pkg/Dxe/PlatformBds/Generic/Language.h
@@ -24,9 +24,7 @@ Revision History
 #ifndef _LANGUAGE_H\r
 #define _LANGUAGE_H\r
 \r
-#ifndef ISO_639_2_ENTRY_SIZE\r
 #define ISO_639_2_ENTRY_SIZE  3\r
-#endif\r
 \r
 VOID\r
 InitializeLanguage (\r

diff --git a/MdePkg/Include/Protocol/IP4.h b/MdePkg/Include/Protocol/IP4.h
index 5a6ab5976bd34eb349327127007f7579aa41566c..571c534a5aff27b900f4a36413364653e62327cb 100644 (file)
--- a/MdePkg/Include/Protocol/IP4.h
+++ b/MdePkg/Include/Protocol/IP4.h
@@ -83,13 +83,8 @@ typedef struct {
 #pragma pack(1)\r
 \r
 typedef struct {\r
-#ifdef EFI_NET_LITTLE_ENDIAN\r
   UINT8                   HeaderLength:4;\r
   UINT8                   Version:4;\r
-#else \r
-  UINT8                   Version:4;\r
-  UINT8                   HeaderLength:4;\r
-#endif\r
   UINT8                   TypeOfService;\r
   UINT16                  TotalLength;\r
   UINT16                  Identification;\r