From: vanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Thu, 15 Mar 2007 02:33:16 +0000 (+0000)
Subject: 1. Remove #ifdef _MSC_EXTENSION_ from all source files
X-Git-Tag: edk2-stable201903~23422
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=e5f461a8507ffcc89cd99ca43a09b76dca136ab5

1. Remove #ifdef _MSC_EXTENSION_ from all source files
2. Remove #ifdef _GCC_ from all resource files
3. Remove #if 0 from all resource files
4. Remove #ifdef MDE_CPU_IPF and #ifdef MDE_CPU_EBC
5. Remove #progam from Decode.c
6. Remove #ifdef TIANO_EXTENSION_FLAG from source files
7. Remove #ifdef SUPPORT_IPV6, since code base doesn't support IPV6 at all.
8. Remove #ifdef SpecialNowaitVersion from pxe_bc_mtftp.c, since it's only used for test.


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

diff --git a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciDeviceSupport.c b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciDeviceSupport.c
index 3b49595130..cbbc00b183 100644
--- a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciDeviceSupport.c
+++ b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciDeviceSupport.c
@@ -338,14 +338,10 @@ Returns:
 
   //
   // Force Interrupt line to "Unknown" or "No Connection"
-  // based on the PCI spec, the Interrupt line for x86 should be set as 0xFF for unknown.
   //
   PciIo = &(PciIoDevice->PciIo);
-#ifndef MDE_CPU_IPF
   Data8 = PCI_INT_LINE_UNKNOWN;
-#else
-  Data8 = 0;
-#endif
+
   PciIo->Pci.Write (PciIo, EfiPciIoWidthUint8, 0x3C, 1, &Data8);
 
   //
diff --git a/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Decode.c b/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Decode.c
index c42865612a..cb7fa89749 100644
--- a/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Decode.c
+++ b/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Decode.c
@@ -1,13 +1,13 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
-are licensed and made available under the terms and conditions of the BSD License         
-which accompanies this distribution.  The full text of the license may be found at        
-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.             
+Copyright (c) 2006 - 2007, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+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.
 
 Module name:
     decode.c
@@ -21,16 +21,6 @@ Revision history:
 // TODO: fix comment to add: Module Name: DECODE.C
 #include "Undi32.h"
 
-
-//
-// #pragma data_seg("rtdata") is only recognized by MSFT C compiler.
-// But EBC compiler "Intel(R) C Compiler for EFI Byte Code, Version 1.2 Build 20040123"
-// does not recognize this pragma.
-//
-#if defined(_MSC_EXTENSIONS) && !defined(MDE_CPU_EBC)
-#pragma data_seg("rtdata")
-#endif
-
 //
 // Global variables defined in this file
 //
@@ -1339,7 +1329,7 @@ Returns:
   }
 
   AdapterInfo               = &(UNDI32DeviceList[CdbPtr->IFnum]->NicInfo);
-  
+
   //
   // entering from older entry point
   //
@@ -1655,11 +1645,3 @@ Returns:
   PxePtr->Fudge         = (UINT8) (PxePtr->Fudge - ChkSum ((VOID *) PxePtr, PxePtr->Len));
 }
 
-//
-// #pragma data_seg("rtdata") is only recognized by MSFT C compiler.
-// But EBC compiler "Intel(R) C Compiler for EFI Byte Code, Version 1.2 Build 20040123"
-// does not recognize this pragma.
-//
-#if defined(_MSC_EXTENSIONS) && !defined(MDE_CPU_EBC)
-#pragma data_seg()
-#endif
diff --git a/EdkModulePkg/Library/EdkGenericBdsLib/DevicePath.c b/EdkModulePkg/Library/EdkGenericBdsLib/DevicePath.c
index 1bb7d70b10..f0debd5662 100644
--- a/EdkModulePkg/Library/EdkGenericBdsLib/DevicePath.c
+++ b/EdkModulePkg/Library/EdkGenericBdsLib/DevicePath.c
@@ -1,13 +1,13 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
-are licensed and made available under the terms and conditions of the BSD License         
-which accompanies this distribution.  The full text of the license may be found at        
-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.             
+Copyright (c) 2006 - 2007, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+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.
 
 Module Name:
 
@@ -20,11 +20,6 @@ Abstract:
 
 --*/
 
-
-#ifdef TIANO_EXTENSION_FLAG
-EFI_GUID  UnknownDeviceGuid           = UNKNOWN_DEVICE_GUID;
-#endif 
-
 EFI_GUID  mEfiUnixThunkProtocolGuid  = EFI_UNIX_THUNK_PROTOCOL_GUID;
 EFI_GUID  mEfiUnixUgaGuid            = EFI_UNIX_UGA_GUID;
 EFI_GUID  mEfiMsgPcAnsiGuid           = DEVICE_PATH_MESSAGING_PC_ANSI;
@@ -90,19 +85,19 @@ CatPrint (
 
 Routine Description:
 
-    Concatenates a formatted unicode string to allocated pool.  
+    Concatenates a formatted unicode string to allocated pool.
     The caller must free the resulting buffer.
 
 Arguments:
 
-    Str         - Tracks the allocated pool, size in use, and 
+    Str         - Tracks the allocated pool, size in use, and
                   amount of pool allocated.
 
     fmt         - The format string
 
 Returns:
 
-    Allocated buffer with the formatted string printed in it.  
+    Allocated buffer with the formatted string printed in it.
     The caller must free the allocated buffer.   The buffer
     allocation is not packed.
 
@@ -161,7 +156,7 @@ Arguments:
 
 Returns:
 
-  If the memory for the device path is successfully allocated, then a 
+  If the memory for the device path is successfully allocated, then a
   pointer to the new device path is returned.  Otherwise, NULL is returned.
 
 --*/
@@ -998,7 +993,7 @@ LibDuplicateDevicePathInstance (
 
 Routine Description:
 
-  Function creates a device path data structure that identically matches the 
+  Function creates a device path data structure that identically matches the
   device path passed in.
 
 Arguments:
@@ -1007,7 +1002,7 @@ Arguments:
 
 Returns:
 
-  The new copy of DevPath is created to identically match the input.  
+  The new copy of DevPath is created to identically match the input.
   Otherwise, NULL is returned.
 
 --*/
diff --git a/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.msa b/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.msa
index e4d527b084..85298640bf 100644
--- a/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.msa
+++ b/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.msa
@@ -40,6 +40,9 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">
       <Keyword>BaseMemoryLib</Keyword>
     </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>MemoryAllocationLib</Keyword>
+    </LibraryClass>
     <LibraryClass Usage="ALWAYS_CONSUMED">
       <Keyword>UefiBootServicesTableLib</Keyword>
     </LibraryClass>
diff --git a/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleService.c b/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleService.c
index 9f4fe3c061..50de4c6c9d 100644
--- a/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleService.c
+++ b/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleService.c
@@ -1,13 +1,13 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
-are licensed and made available under the terms and conditions of the BSD License         
-which accompanies this distribution.  The full text of the license may be found at        
-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.             
+Copyright (c) 2006 - 2007, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+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.
 
 Module Name:
 
@@ -43,7 +43,7 @@ Arguments:
   CapsuleHeaderArray             A array of pointers to capsule headers passed in
   CapsuleCount                   The number of capsule
   ScatterGatherList              Physical address of datablock list points to capsule
-  
+
 Returns:
 
   EFI STATUS
@@ -51,8 +51,8 @@ Returns:
                                  not set, the capsule has been successfully processed by the firmware.
                                  If it set, the ScattlerGatherList is successfully to be set.
   EFI_INVALID_PARAMETER          CapsuleCount is less than 1,CapsuleGuid is not supported.
-  EFI_DEVICE_ERROR               Failed to SetVariable or AllocatePool or ProcessFirmwareVolume. 
-  
+  EFI_DEVICE_ERROR               Failed to SetVariable or AllocatePool or ProcessFirmwareVolume.
+
 --*/
 {
   UINTN                     CapsuleSize;
@@ -76,17 +76,17 @@ Returns:
   for (ArrayNumber = 0; ArrayNumber < CapsuleCount; ArrayNumber++) {
     CapsuleHeader = CapsuleHeaderArray[ArrayNumber];
     if ((CapsuleHeader->Flags & (CAPSULE_FLAGS_PERSIST_ACROSS_RESET | CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE)) == CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) {
-      return EFI_INVALID_PARAMETER;      
+      return EFI_INVALID_PARAMETER;
     }
     if (!CompareGuid (&CapsuleHeader->CapsuleGuid, &mEfiCapsuleHeaderGuid)) {
       if ((CapsuleHeader->Flags & CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) == 0) {
         return EFI_UNSUPPORTED;
-      }  
-    }   
+      }
+    }
   }
 
   //
-  //Assume that capsules have the same flags on reseting or not. 
+  //Assume that capsules have the same flags on reseting or not.
   //
   CapsuleHeader = CapsuleHeaderArray[0];
 
@@ -97,28 +97,28 @@ Returns:
     if (!FeaturePcdGet(PcdSupportUpdateCapsuleRest)) {
       return EFI_UNSUPPORTED;
     }
-    
+
     if (ScatterGatherList == 0) {
       return EFI_INVALID_PARAMETER;
     } else {
       Status = EfiSetVariable (
-                 EFI_CAPSULE_VARIABLE_NAME,  
-                 &gEfiCapsuleVendorGuid,     
-                 EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_BOOTSERVICE_ACCESS,  
-                 sizeof (UINTN), 
-                 (VOID *) &ScatterGatherList 
+                 EFI_CAPSULE_VARIABLE_NAME,
+                 &gEfiCapsuleVendorGuid,
+                 EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_BOOTSERVICE_ACCESS,
+                 sizeof (UINTN),
+                 (VOID *) &ScatterGatherList
                  );
-      if (Status != EFI_SUCCESS) { 
+      if (Status != EFI_SUCCESS) {
         return EFI_DEVICE_ERROR;
       }
     }
     return EFI_SUCCESS;
   }
-  
+
   //
   //The rest occurs in the condition of non-reset mode
   //
-  if (EfiAtRuntime ()) { 
+  if (EfiAtRuntime ()) {
     return EFI_INVALID_PARAMETER;
   }
 
@@ -128,34 +128,31 @@ Returns:
   for (ArrayNumber = 0; ArrayNumber < CapsuleCount ; ArrayNumber++) {
     CapsuleHeader = CapsuleHeaderArray[ArrayNumber];
     CapsuleSize = CapsuleHeader->CapsuleImageSize - CapsuleHeader->HeaderSize;
-    Status = gBS->AllocatePool (EfiBootServicesData, CapsuleSize, &BufferPtr);
-    if (Status != EFI_SUCCESS) {
-      goto Done;
+
+    BufferPtr = AllocatePool (CapsuleSize);
+    if (BufferPtr == NULL) {
+      return EFI_DEVICE_ERROR;
     }
-    gBS->CopyMem (BufferPtr, (UINT8*)CapsuleHeader+ CapsuleHeader->HeaderSize, CapsuleSize);
+
+    CopyMem (BufferPtr, (UINT8*)CapsuleHeader+ CapsuleHeader->HeaderSize, CapsuleSize);
 
     //
-    //Call DXE service ProcessFirmwareVolume to process immediatelly 
+    //Call DXE service ProcessFirmwareVolume to process immediatelly
     //
     Status = gDS->ProcessFirmwareVolume (BufferPtr, CapsuleSize, &FvHandle);
     if (Status != EFI_SUCCESS) {
-      gBS->FreePool (BufferPtr);
+      FreePool (BufferPtr);
       return EFI_DEVICE_ERROR;
     }
     gDS->Dispatch ();
-    gBS->FreePool (BufferPtr);
+    FreePool (BufferPtr);
   }
-  return EFI_SUCCESS;
 
-Done:
-  if (BufferPtr != NULL) {
-    gBS->FreePool (BufferPtr);
-  }     
-  return EFI_DEVICE_ERROR;
+  return EFI_SUCCESS;
 }
 
 
-  
+
 EFI_STATUS
 EFIAPI
 QueryCapsuleCapabilities (
@@ -196,10 +193,10 @@ Returns:
 
   if ((MaxiumCapsuleSize == NULL) ||(ResetType == NULL)) {
     return EFI_INVALID_PARAMETER;
-  }  
+  }
 
   CapsuleHeader = NULL;
-  
+
   //
   //Compare GUIDs with EFI_CAPSULE_GUID, if capsule header contains CAPSULE_FLAGS_PERSIST_ACROSS_RESET
   //and CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE flags,whatever the GUID is ,the service supports.
@@ -207,19 +204,19 @@ Returns:
   for (ArrayNumber = 0; ArrayNumber < CapsuleCount; ArrayNumber++) {
     CapsuleHeader = CapsuleHeaderArray[ArrayNumber];
     if ((CapsuleHeader->Flags & (CAPSULE_FLAGS_PERSIST_ACROSS_RESET | CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE)) == CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) {
-      return EFI_INVALID_PARAMETER;      
+      return EFI_INVALID_PARAMETER;
     }
     if (!CompareGuid (&CapsuleHeader->CapsuleGuid, &mEfiCapsuleHeaderGuid)) {
       if ((CapsuleHeader->Flags & CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) == 0) {
         return EFI_UNSUPPORTED;
       }
-    }  
+    }
   }
 
   //
-  //Assume that capsules have the same flags on reseting or not. 
+  //Assume that capsules have the same flags on reseting or not.
   //
-  CapsuleHeader = CapsuleHeaderArray[0];  
+  CapsuleHeader = CapsuleHeaderArray[0];
   if ((CapsuleHeader->Flags & CAPSULE_FLAGS_PERSIST_ACROSS_RESET) != 0) {
     //
     //Check if the platform supports update capsule across a system reset
@@ -228,11 +225,11 @@ Returns:
       return EFI_UNSUPPORTED;
     }
     *ResetType = EfiResetWarm;
-    *MaxiumCapsuleSize = FixedPcdGet32(PcdMaxSizePopulateCapsule);    
+    *MaxiumCapsuleSize = FixedPcdGet32(PcdMaxSizePopulateCapsule);
   } else {
     *ResetType = EfiResetCold;
     *MaxiumCapsuleSize = FixedPcdGet32(PcdMaxSizeNonPopulateCapsule);
-  }  
+  }
   return EFI_SUCCESS;
-} 
+}
 
diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/Bc.h b/EdkModulePkg/Universal/Network/PxeBc/Dxe/Bc.h
index 26df291a29..ba32dee45b 100644
--- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/Bc.h
+++ b/EdkModulePkg/Universal/Network/PxeBc/Dxe/Bc.h
@@ -1,13 +1,13 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
-are licensed and made available under the terms and conditions of the BSD License         
-which accompanies this distribution.  The full text of the license may be found at        
-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.             
+Copyright (c) 2006 - 2007, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+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.
 
 Module Name:
   bc.h
@@ -39,9 +39,9 @@ Abstract:
 //
 // Determine the classes of IPv4 address
 //
-#define  IS_CLASSA_IPADDR(x)  ((((EFI_IP_ADDRESS*)x)->v4.Addr[0] & 0x80) == 0x00) 
-#define  IS_CLASSB_IPADDR(x)  ((((EFI_IP_ADDRESS*)x)->v4.Addr[0] & 0xc0) == 0x80) 
-#define  IS_CLASSC_IPADDR(x)  ((((EFI_IP_ADDRESS*)x)->v4.Addr[0] & 0xe0) == 0xc0) 
+#define  IS_CLASSA_IPADDR(x)  ((((EFI_IP_ADDRESS*)x)->v4.Addr[0] & 0x80) == 0x00)
+#define  IS_CLASSB_IPADDR(x)  ((((EFI_IP_ADDRESS*)x)->v4.Addr[0] & 0xc0) == 0x80)
+#define  IS_CLASSC_IPADDR(x)  ((((EFI_IP_ADDRESS*)x)->v4.Addr[0] & 0xe0) == 0xc0)
 #define  IS_INADDR_UNICAST(x) ((IS_CLASSA_IPADDR(x) || IS_CLASSB_IPADDR(x) || IS_CLASSC_IPADDR(x)) && (((EFI_IP_ADDRESS*)x)->Addr[0] != 0) )
 
 //
@@ -92,14 +92,7 @@ typedef struct {
   EFI_EVENT                                 IgmpGroupEvent[MAX_MCAST_GROUPS];
   UINT16                                    RandomPort;
 
-#if SUPPORT_IPV6
-  //
-  // TBD
-  //
-#else
   UINT32          MCastGroup[MAX_MCAST_GROUPS];
-#endif
-
   BOOLEAN         GoodStationIp;
   BOOLEAN         DidTransmit;
   UINTN           IpLength;
diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/bc.c b/EdkModulePkg/Universal/Network/PxeBc/Dxe/bc.c
index 44f7cf22c6..4444b20d00 100644
--- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/bc.c
+++ b/EdkModulePkg/Universal/Network/PxeBc/Dxe/bc.c
@@ -1,12 +1,13 @@
 /*++
-Copyright (c) 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
-are licensed and made available under the terms and conditions of the BSD License         
-which accompanies this distribution.  The full text of the license may be found at        
-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.             
+
+Copyright (c) 2006 - 2007, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+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.
 
 Module Name:
         bc.c
@@ -162,7 +163,7 @@ SeedRandom (
   Arguments:
 
   Returns:
-    none                - 
+    none                -
 
 --*/
 {
@@ -216,7 +217,7 @@ IpChecksum (
     Length             - Length to be checksummed
 
   Returns:
-    Checksum           - Returns the 16 bit ones complement of 
+    Checksum           - Returns the 16 bit ones complement of
                          ones complement sum of 16 bit words
 
 --*/
@@ -264,7 +265,7 @@ IpChecksum2 (
     MessageLen    - Length to be checksummed
 
   Returns:
-    Checksum      - Returns the 16 bit ones complement of 
+    Checksum      - Returns the 16 bit ones complement of
                     ones complement sum of 16 bit words
 
 --*/
@@ -298,7 +299,7 @@ UpdateChecksum (
     NewWord            - New Value
 
   Returns:
-    Checksum           - Returns the 16 bit ones complement of 
+    Checksum           - Returns the 16 bit ones complement of
                          ones complement sum of 16 bit words
 
 --*/
@@ -328,7 +329,7 @@ SetMakeCallback (
 
   Returns:
     0                  - Callbacks are active on the handle
-    1                  - Callbacks are not active on the handle                         
+    1                  - Callbacks are not active on the handle
 
 --*/
 {
@@ -385,7 +386,7 @@ WaitForReceive (
   Arguments:
     Private       - Pointer to Pxe BaseCode Protocol
     Function      - What PXE function to callback
-    TimeoutEvent  - Timer event that will trigger when we have waited too 
+    TimeoutEvent  - Timer event that will trigger when we have waited too
                     long for an incoming packet
     HeaderSizePtr - Pointer to the size of the Header size
     BufferSizePtr - Pointer to the size of the Buffer size
@@ -446,52 +447,6 @@ WaitForReceive (
   //
   for (;;)
   {
-#if 0
-    //
-    // Check for received packet event.
-    //
-    if (!EFI_ERROR (gBS->CheckEvent (SnpPtr->WaitForPacket))) {
-      //
-      // Packet should be available.  Attempt to read it.
-      //
-      *BufferSizePtr = BUFFER_ALLOCATE_SIZE;
-
-      StatCode = SnpPtr->Receive (
-                          SnpPtr,
-                          HeaderSizePtr,
-                          BufferSizePtr,
-                          Private->ReceiveBufferPtr,
-                          0,
-                          0,
-                          ProtocolPtr
-                          );
-
-      if (EFI_ERROR (StatCode)) {
-        break;
-      }
-      //
-      // Packet was received.  Make received callback then return.
-      //
-      if (CallbackPtr != NULL) {
-        StatCode = CallbackPtr (
-                    Private->CallbackProtocolPtr,
-                    Function,
-                    TRUE,
-                    (UINT32) *BufferSizePtr,
-                    (EFI_PXE_BASE_CODE_PACKET *) Private->ReceiveBufferPtr
-                    );
-
-        if (StatCode != EFI_PXE_BASE_CODE_CALLBACK_STATUS_CONTINUE) {
-          StatCode = EFI_ABORTED;
-        } else {
-          StatCode = EFI_SUCCESS;
-        }
-      }
-
-      break;
-    }
-
-#else
     //
     // Poll for received packet.
     //
@@ -533,7 +488,7 @@ WaitForReceive (
     if (StatCode != EFI_NOT_READY) {
       break;
     }
-#endif
+
     //
     // Check for callback event.
     //
@@ -599,7 +554,7 @@ SendPacket (
 
   Arguments:
     Private       - Pointer to Pxe BaseCode Protocol
-    HeaderPtr          - Pointer to the buffer 
+    HeaderPtr          - Pointer to the buffer
     PacketPtr          - Pointer to the packet to send
     PacketLen        - The length of the entire packet to send
     HardwareAddr        - Pointer to the MAC address of the destination
@@ -1263,7 +1218,6 @@ BcStart (
     return EFI_ALREADY_STARTED;
   }
 
-#if !SUPPORT_IPV6
   //
   // Fail if IPv6 is requested and not supported.
   //
@@ -1272,7 +1226,7 @@ BcStart (
     EfiReleaseLock (&Private->Lock);
     return EFI_UNSUPPORTED;
   }
-#endif
+
   //
   // Setup shortcuts to SNP protocol and data structure.
   //
@@ -1505,12 +1459,8 @@ BcStart (
   // supports IPv6.
   //
   Private->EfiBc.Mode->Ipv6Supported = SUPPORT_IPV6;
-
-#if SUPPORT_IPV6
-  Private->EfiBc.Mode->Ipv6Available = Private->NiiPtr->Ipv6Supported;
-#else
   Private->EfiBc.Mode->Ipv6Available = FALSE;
-#endif
+
   //
   // Set to TRUE by the BC constructor if this BC implementation
   // supports BIS.
@@ -1756,14 +1706,7 @@ IpFilter (
           //
           if (!Index2)
           {
-#if SUPPORT_IPV6
-            if (PxebcMode->UsingIpv6) {
-              //
-              // TBD
-              //
-            } else
-#endif
-              TmpIp = (EFI_IP_ADDRESS *) &AllSystemsGroup;
+            TmpIp = (EFI_IP_ADDRESS *) &AllSystemsGroup;
             --Index;
           } else {
             TmpIp = (EFI_IP_ADDRESS *) &Filter->IpList[Index];
@@ -2309,12 +2252,8 @@ PxeBcDriverStart (
   // implementation supports IPv6.
   //
   Private->EfiBc.Mode->Ipv6Supported = SUPPORT_IPV6;
-
-#if SUPPORT_IPV6
-  Private->EfiBc.Mode->Ipv6Available = Private->NiiPtr->Ipv6Supported;
-#else
   Private->EfiBc.Mode->Ipv6Available = FALSE;
-#endif
+
   //
   // Set to TRUE by the BC constructor if this BC
   // implementation supports BIS.
diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/ip.h b/EdkModulePkg/Universal/Network/PxeBc/Dxe/ip.h
index 69bfe6d6de..5cabf2e050 100644
--- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/ip.h
+++ b/EdkModulePkg/Universal/Network/PxeBc/Dxe/ip.h
@@ -1,13 +1,13 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
-are licensed and made available under the terms and conditions of the BSD License         
-which accompanies this distribution.  The full text of the license may be found at        
-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.             
+Copyright (c) 2006 - 2007, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+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.
 
 --*/
 
@@ -19,7 +19,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 //
 // Client architecture types
 //
-#if defined   MDE_CPU_IA32    
+#if defined   MDE_CPU_IA32
 #define       SYS_ARCH  0x6
 #elif defined MDE_CPU_X64
 #define       SYS_ARCH  0x7
@@ -332,7 +332,7 @@ typedef struct {
   // zero transmitted means checksum not computed
   // data follows
   //
-  UINT16  Checksum;      
+  UINT16  Checksum;
 } UDPV4_HEADER;
 
 typedef struct {
@@ -370,7 +370,7 @@ typedef struct {
   // zero checksum is transmitted as -0 (ones comp)
   // zero transmitted means checksum not computed
   //
-  UINT16  Checksum; 
+  UINT16  Checksum;
   UINT16  UrgentPointer;                // pointer to urgent data (allows sender to specify urgent data)
 } TCPV4_HEADER;
 
@@ -435,7 +435,7 @@ typedef struct {
 } IPV4_STRUCT;
 
 #pragma pack()  // reset to default
-  
+
   ////////////////////////////////////////////////////////////
 //
 //  BC IP Filter Routine
@@ -723,13 +723,6 @@ IpReceive (
   )
 ;
 
-#if 0
-VOID
-WaitForTxComplete (
-  IN PXE_BASECODE_DEVICE    *Private
-  )
-;
-#endif
 //
 // routine to cycle waiting for a receive or timeout
 //
diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_igmp.c b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_igmp.c
index f4935b26b3..83ca20b292 100644
--- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_igmp.c
+++ b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_igmp.c
@@ -1,13 +1,13 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
-are licensed and made available under the terms and conditions of the BSD License         
-which accompanies this distribution.  The full text of the license may be found at        
-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.             
+Copyright (c) 2006 - 2007, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+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.
 
 --*/
 
@@ -272,13 +272,6 @@ Returns:
 
   Grp = *(UINT32 *) GroupPtr;
 
-#if SUPPORT_IPV6
-  if (Private->EfiBc.Mode->UsingIpv6) {
-    //
-    // TBD
-    //
-  }
-#endif
   //
   // see if we already have it or if we can't take anymore
   //
@@ -324,13 +317,6 @@ Returns:
 
   Grp = *(UINT32 *) GroupPtr;
 
-#if SUPPORT_IPV6
-  if (Private->EfiBc.Mode->UsingIpv6) {
-    //
-    // TBD
-    //
-  }
-#endif
   //
   // if not in group, ignore
   //
diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_ip.c b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_ip.c
index e0e12ece81..bf60d51a66 100644
--- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_ip.c
+++ b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_ip.c
@@ -1,13 +1,13 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
-are licensed and made available under the terms and conditions of the BSD License         
-which accompanies this distribution.  The full text of the license may be found at        
-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.             
+Copyright (c) 2006 - 2007, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+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.
 
 Module Name:
   pxe_bc_ip.c
@@ -609,14 +609,6 @@ IpReceive (
       continue;
     }
 
-#if SUPPORT_IPV6
-    if (PxeBcMode->UsingIpv6) {
-      //
-      // TBD
-      //
-    }
-#endif
-
 #define IpRxHeader  ((IPV4_HEADER *) PacketPtr)
 
     //
diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_mtftp.c b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_mtftp.c
index b99f2d303d..a937958468 100644
--- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_mtftp.c
+++ b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_mtftp.c
@@ -1,16 +1,16 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
-are licensed and made available under the terms and conditions of the BSD License         
-which accompanies this distribution.  The full text of the license may be found at        
-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.             
+Copyright (c) 2006 - 2007, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+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.
 
 Module Name:
-  
+
     pxe_bc_mtftp.c
 
 Abstract:
@@ -91,21 +91,21 @@ Routine description:
   information in Mode structure and return TFTP_ERROR status.
 
 Parameters:
-  Private := 
-  Operation := 
-  HeaderPtr := 
-  BufferSizePtr := 
-  BufferPtr := 
-  ServerIpPtr := 
-  ServerPortPtr := 
-  OurIpPtr := 
-  OurPortPtr := 
-  Timeout := 
+  Private :=
+  Operation :=
+  HeaderPtr :=
+  BufferSizePtr :=
+  BufferPtr :=
+  ServerIpPtr :=
+  ServerPortPtr :=
+  OurIpPtr :=
+  OurPortPtr :=
+  Timeout :=
 
 Returns:
-  EFI_SUCCESS := 
-  EFI_TFTP_ERROR := 
-  other := 
+  EFI_SUCCESS :=
+  EFI_TFTP_ERROR :=
+  other :=
 --*/
 {
   EFI_PXE_BASE_CODE_MODE  *PxeBcMode;
@@ -191,10 +191,10 @@ Routine description:
   Send TFTP ERROR message to TFTP server
 
 Parameters:
-  Private := 
-  ServerIpPtr := 
-  ServerPortPtr := 
-  OurPortPtr := 
+  Private :=
+  ServerIpPtr :=
+  ServerPortPtr :=
+  OurPortPtr :=
 
 Returns:
 --*/
@@ -249,7 +249,7 @@ Parameters:
   ServerPortPtr := Pointer to TFTP server UDP port
   ReplyIpPtr := Pointer to TFTP DATA packet destination IP address
   OurPortPtr := Pointer to TFTP client UDP port
-  Timeout := 
+  Timeout :=
   ReplyLenPtr := Pointer to packet length
   PxeBcMode := Pointer to packet buffer
   BlockNumPtr := Pointer to block number
@@ -398,7 +398,7 @@ Parameters:
   ReplyIpPtr := Pointer to TFTP DATA packet destination IP address
   OurPortPtr := Pointer to TFTP client UDP port
   LastBlock := Last block number received
-  Timeout := 
+  Timeout :=
   DontUseBuffer := TRUE == throw away data, just count # of bytes
 
 Returns:
@@ -605,7 +605,7 @@ Parameters:
   OurPortPtr := Pointer to TFTP client UDP port
   FilenamePtr := Pointer to TFTP file or directory name
   PacketSizePtr := Pointer to block size
-  Buffer := 
+  Buffer :=
 
 Returns:
 --*/
@@ -713,16 +713,16 @@ Parameters:
   Req := TFTP request type
   Options := TFTP option bits
   Private := Pointer to PxeBc interface
-  HeaderPtr := 
+  HeaderPtr :=
   PacketSizePtr := Pointer to block size
-  ReplyLenPtr := 
-  BufferPtr := 
+  ReplyLenPtr :=
+  BufferPtr :=
   ServerIpPtr := Pointer to TFTP server IP address
   ServerPortPtr := Pointer to TFTP server UDP port
-  ServerReplyPortPtr := 
+  ServerReplyPortPtr :=
   OurPortPtr := Pointer to TFTP client UDP Port
   FilenamePtr := Pointer to file or directory name
-  Timeout := 
+  Timeout :=
 
 Returns:
 --*/
@@ -847,15 +847,15 @@ Routine description:
 
 Parameters:
   Private := Pointer to PxeBc interface
-  BufferSizePtr := 
-  BufferPtr := 
+  BufferSizePtr :=
+  BufferPtr :=
   ServerIpPtr := Pointer to TFTP server IP address
   MtftpInfoPtr := Pointer to MTFTP session information
   StartBlockPtr := IN=first block we are looking for  OUT=first block received
   NumMissedPtr := Number of blocks missed
-  TransTimeout := 
-  ListenTimeout := 
-  FinalBlock := 
+  TransTimeout :=
+  ListenTimeout :=
+  FinalBlock :=
   DontUseBuffer := TRUE == throw packets away, just count bytes
 
 Returns:
@@ -991,17 +991,17 @@ Routine description:
 Parameters:
   Private := Pointer to PxeBc interface
   BufferSizePtr := IN=buffer size  OUT=transfer size
-  BufferPtr := 
-  PacketSizePtr := 
-  ServerIpPtr := 
-  FilenamePtr := 
-  MtftpInfoPtr := 
-  CompletionStatusPtr := 
-  DontUseBuffer := 
+  BufferPtr :=
+  PacketSizePtr :=
+  ServerIpPtr :=
+  FilenamePtr :=
+  MtftpInfoPtr :=
+  CompletionStatusPtr :=
+  DontUseBuffer :=
 
 Returns:
 // mtftp open session
-// return code EFI_SUCCESS 
+// return code EFI_SUCCESS
 //      and *CompletionStatusPtr = GOTUNI | GOTMULTI means done
 //      and *CompletionStatusPtr = GOTMULTI means got first two multicast packets, use listen for rest
 //      and *CompletionStatusPtr = 0 means did not get first two multicast packets, use listen for all
@@ -1205,12 +1205,12 @@ Routine description:
 
 Parameters:
   Private := Pointer to PxeBc interface
-  BufferSizePtr := 
-  BufferPtr := 
-  ServerIpPtr := 
-  FilenamePtr := 
-  MtftpInfoPtr := 
-  DontUseBuffer := 
+  BufferSizePtr :=
+  BufferPtr :=
+  ServerIpPtr :=
+  FilenamePtr :=
+  MtftpInfoPtr :=
+  DontUseBuffer :=
 
 Returns:
 --*/
@@ -1255,17 +1255,8 @@ Returns:
       BufferPtrLocal = BufferPtr + Offset;
 
     }
-    //
-    // special !!! do not leave enabled in saved version on Source Safe
-    // Following code put in in order to create a special version for regression
-    // test of MTFTP server to make sure it handles mulitple opens correctly.
-    // This code should NOT be enabled normally.
-    //
-#ifdef SpecialNowaitVersion
-#pragma message ("This is special version for MTFTP regression test")
-    if (StartBlock || !LastBlock)
-#endif
-      if (((Status = MtftpListen (
+
+    if (((Status = MtftpListen (
                       Private,
                       &BufferSize,
                       BufferPtrLocal,
@@ -1278,11 +1269,11 @@ Returns:
                       LastBlock,
                       DontUseBuffer
                       )) != EFI_SUCCESS) && (Status != EFI_TIMEOUT)) {
-        return Status;
-        //
-        // failed
-        //
-      }
+      return Status;
+      //
+      // failed
+      //
+    }
     //
     // if none were received, start block is not reset
     //
@@ -1399,12 +1390,12 @@ Routine description:
 // if OACK received, set info
 
 Parameters:
-  Private := 
-  BufferSizePtr := 
-  ServerIpPtr := 
-  SrvPort := 
-  FilenamePtr := 
-  PacketSizePtr := 
+  Private :=
+  BufferSizePtr :=
+  ServerIpPtr :=
+  SrvPort :=
+  FilenamePtr :=
+  PacketSizePtr :=
 
 Returns:
 --*/
@@ -1581,15 +1572,15 @@ Routine description:
 //  while data size is max
 
 Parameters:
-  Private := 
-  BufferSizePtr := 
-  BufferPtr := 
-  ServerIpPtr := 
-  FilenamePtr := 
-  PacketSizePtr := 
-  SrvPort := 
-  Req := 
-  DontUseBuffer := 
+  Private :=
+  BufferSizePtr :=
+  BufferPtr :=
+  ServerIpPtr :=
+  FilenamePtr :=
+  PacketSizePtr :=
+  SrvPort :=
+  Req :=
+  DontUseBuffer :=
 
 Returns:
 --*/
@@ -1765,13 +1756,13 @@ Routine description:
 //  while data size is max
 
 Parameters:
-  Private := 
-  BufferSizePtr := 
-  BufferPtr := 
-  ServerIpPtr := 
-  FilenamePtr := 
-  PacketSizePtr := 
-  Overwrite := 
+  Private :=
+  BufferSizePtr :=
+  BufferPtr :=
+  ServerIpPtr :=
+  FilenamePtr :=
+  PacketSizePtr :=
+  Overwrite :=
 
 Returns:
 --*/
@@ -1951,16 +1942,16 @@ Routine description:
   MTFTP API entry point
 
 Parameters:
-  Private := 
-  Operation := 
-  BufferSizePtr := 
-  BufferPtr := 
-  ServerIpPtr := 
-  FilenamePtr := 
-  PacketSizePtr := 
-  MtftpInfoPtr := 
-  Overwrite := 
-  DontUseBuffer := 
+  Private :=
+  Operation :=
+  BufferSizePtr :=
+  BufferPtr :=
+  ServerIpPtr :=
+  FilenamePtr :=
+  PacketSizePtr :=
+  MtftpInfoPtr :=
+  Overwrite :=
+  DontUseBuffer :=
 
 Returns:
  *  EFI_INVALID_PARAMETER
@@ -2313,16 +2304,16 @@ Routine description:
   MTFTP API entry point.
 
 Parameters:
-  This := 
-  Operation := 
-  BufferPtr := 
-  Overwrite := 
-  BufferSizePtr := 
-  BlockSizePtr := 
-  ServerIpPtr := 
-  FilenamePtr := 
-  MtftpInfoPtr := 
-  DontUseBuffer := 
+  This :=
+  Operation :=
+  BufferPtr :=
+  Overwrite :=
+  BufferSizePtr :=
+  BlockSizePtr :=
+  ServerIpPtr :=
+  FilenamePtr :=
+  MtftpInfoPtr :=
+  DontUseBuffer :=
 
 Returns:
  *  EFI_INVALID_PARAMETER
diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_udp.c b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_udp.c
index 32768c05c6..a8b9ed089b 100644
--- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_udp.c
+++ b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_udp.c
@@ -1,13 +1,13 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
-are licensed and made available under the terms and conditions of the BSD License         
-which accompanies this distribution.  The full text of the license may be found at        
-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.             
+Copyright (c) 2006 - 2007, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+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.
 
 Module Name:
   pxe_bc_udp.c
@@ -44,21 +44,21 @@ Routine description:
 
 Parameters:
   Private := Pointer to PxeBc interface
-  OpFlags := 
-  DestIpPtr := 
-  DestPortPtr := 
-  GatewayIpPtr := 
-  SrcIpPtr := 
-  SrcPortPtr := 
-  HeaderSizePtr := 
-  HeaderPtr := 
-  BufferSizeptr := 
-  BufferPtr := 
+  OpFlags :=
+  DestIpPtr :=
+  DestPortPtr :=
+  GatewayIpPtr :=
+  SrcIpPtr :=
+  SrcPortPtr :=
+  HeaderSizePtr :=
+  HeaderPtr :=
+  BufferSizeptr :=
+  BufferPtr :=
 
 Returns:
-  EFI_SUCCESS := 
-  EFI_INVALID_PARAMETER := 
-  other := 
+  EFI_SUCCESS :=
+  EFI_INVALID_PARAMETER :=
+  other :=
 --*/
 {
   UINTN                       TotalLength;
@@ -197,20 +197,20 @@ Routine description:
 
 Parameters:
   This := Pointer to PxeBc interface.
-  OpFlags := 
-  DestIpPtr := 
-  DestPortPtr := 
-  GatewayIpPtr := 
-  SrcIpPtr := 
-  SrcPortPtr := 
-  HeaderSizePtr := 
-  HeaderPtr := 
-  BufferSizeptr := 
-  BufferPtr := 
+  OpFlags :=
+  DestIpPtr :=
+  DestPortPtr :=
+  GatewayIpPtr :=
+  SrcIpPtr :=
+  SrcPortPtr :=
+  HeaderSizePtr :=
+  HeaderPtr :=
+  BufferSizeptr :=
+  BufferPtr :=
 
 Returns:
-  EFI_SUCCESS := 
-  other := 
+  EFI_SUCCESS :=
+  other :=
 --*/
 {
   EFI_STATUS          StatCode;
@@ -291,21 +291,21 @@ Routine description:
 
 Parameters:
   Private := Pointer to PxeBc interface
-  OpFlags := 
-  DestIpPtr := 
-  DestPortPtr := 
-  SrcIpPtr := 
-  SrcPortPtr := 
-  HeaderSizePtr := 
-  HeaderPtr := 
-  BufferSizeptr := 
-  BufferPtr := 
+  OpFlags :=
+  DestIpPtr :=
+  DestPortPtr :=
+  SrcIpPtr :=
+  SrcPortPtr :=
+  HeaderSizePtr :=
+  HeaderPtr :=
+  BufferSizeptr :=
+  BufferPtr :=
   TimeoutEvent :=
 
 Returns:
-  EFI_SUCCESS := 
-  EFI_INVALID_PARAMETER := 
-  other := 
+  EFI_SUCCESS :=
+  EFI_INVALID_PARAMETER :=
+  other :=
 --*/
 {
   EFI_STATUS      StatCode;
@@ -362,14 +362,6 @@ Returns:
     CopyMem (&TmpDestIp, &Private->EfiBc.Mode->StationIp, sizeof (TmpDestIp));
   }
 
-#if SUPPORT_IPV6
-  if (Private->EfiBc.Mode->UsingIpv6) {
-    //
-    // %%TBD
-    //
-  }
-#endif
-
   for (;;) {
     *BufferSizeptr = BufferSize;
 
@@ -500,19 +492,19 @@ Routine description:
 
 Parameters:
   This := Pointer to PxeBc interface.
-  OpFlags := 
-  DestIpPtr := 
-  DestPortPtr := 
-  SrcIpPtr := 
-  SrcPortPtr := 
-  HeaderSizePtr := 
-  HeaderPtr := 
-  BufferSizeptr := 
-  BufferPtr := 
+  OpFlags :=
+  DestIpPtr :=
+  DestPortPtr :=
+  SrcIpPtr :=
+  SrcPortPtr :=
+  HeaderSizePtr :=
+  HeaderPtr :=
+  BufferSizeptr :=
+  BufferPtr :=
 
 Returns:
-  EFI_SUCCESS := 
-  other := 
+  EFI_SUCCESS :=
+  other :=
 --*/
 {
   EFI_STATUS          StatCode;
diff --git a/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/PxeDhcp4InitSelect.c b/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/PxeDhcp4InitSelect.c
index 8b7cd28810..3cb7f3f4be 100644
--- a/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/PxeDhcp4InitSelect.c
+++ b/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/PxeDhcp4InitSelect.c
@@ -1,17 +1,17 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
-are licensed and made available under the terms and conditions of the BSD License         
-which accompanies this distribution.  The full text of the license may be found at        
-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.             
+Copyright (c) 2006 - 2007, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+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.
 
 Module Name:
   PxeDhcp4InitSelect.c
-  
+
 Abstract:
 
 --*/
@@ -332,13 +332,6 @@ PxeDhcp4Init (
     return EFI_NOT_READY;
   }
 
-#if 0
-  if (!is_good_discover (&This->Data->Discover)) {
-    //
-    // %%TBD - check discover packet fields
-    //
-  }
-#endif
   //
   // Get pointer to our instance data.
   //
@@ -477,13 +470,6 @@ PxeDhcp4Select (
     return EFI_DEVICE_ERROR;
   }
 
-#if 0
-  if (!is_good_discover (&This->Data->Discover)) {
-    //
-    // %%TBD - check discover packet fields
-    //
-  }
-#endif
   //
   // Setup useful variables...
   //
diff --git a/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/support.c b/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/support.c
index 50c991372d..503d5a6038 100644
--- a/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/support.c
+++ b/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/support.c
@@ -1,17 +1,17 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
-are licensed and made available under the terms and conditions of the BSD License         
-which accompanies this distribution.  The full text of the license may be found at        
-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.             
+Copyright (c) 2006 - 2007, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+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.
 
 Module Name:
   support.c
-  
+
 Abstract:
   Miscellaneous support routines for PxeDhcp4 protocol.
 
@@ -746,7 +746,7 @@ Parameters:
   op_flags := UDP receive operation flags
 
 Returns:
-  EFI_INVALID_PARAMETER := 
+  EFI_INVALID_PARAMETER :=
   EFI_SUCCESS := Packet received
   other := Return from PxeBc->UdpRead()
 --*/
@@ -827,7 +827,7 @@ Parameters:
   SecondsTimeout := Number of seconds until timeout
 
 Returns:
-  EFI_INVALID_PARAMETER := Private == NULL || ServerIp == NULL || 
+  EFI_INVALID_PARAMETER := Private == NULL || ServerIp == NULL ||
     tx_pkt == NULL || rx_pkt == NULL || rx_vfy == NULL || Private->PxeBc == NULL
   EFI_ABORTED := Receive aborted
   EFI_TIMEOUT := No packets received
@@ -923,31 +923,6 @@ Returns:
   //
   // Wait for packet(s)...
   //
-#if 0
-  if (!client_ip) {
-    Aprint ("client_ip == NULL    ");
-  } else {
-    Aprint (
-      "client_ip == %d.%d.%d.%d    ",
-      client_ip->v4.Addr[0],
-      client_ip->v4.Addr[1],
-      client_ip->v4.Addr[2],
-      client_ip->v4.Addr[3]
-      );
-  }
-
-  if (!ServerIp) {
-    Aprint ("ServerIp == NULL\n");
-  } else {
-    Aprint (
-      "ServerIp == %d.%d.%d.%d\n",
-      ServerIp->v4.Addr[0],
-      ServerIp->v4.Addr[1],
-      ServerIp->v4.Addr[2],
-      ServerIp->v4.Addr[3]
-      );
-  }
-#endif
 
   done_flag   = FALSE;
   got_packet  = FALSE;
diff --git a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.msa b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.msa
index 74d433207f..e974647289 100644
--- a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.msa
+++ b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.msa
@@ -39,12 +39,12 @@
   <SourceFiles>
     <Filename>IoLibMmioBuffer.c</Filename>
     <Filename SupArchList="IA32">IoLib.c</Filename>
-    <Filename SupArchList="IA32">IoLibMsc.c</Filename>
-    <Filename SupArchList="IA32">IoLibGcc.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="MSFT">IoLibMsc.c</Filename>
+    <Filename SupArchList="IA32" ToolChainFamily="GCC">IoLibGcc.c</Filename>
     <Filename SupArchList="IA32">IoHighLevel.c</Filename>
     <Filename SupArchList="X64">IoLib.c</Filename>
-    <Filename SupArchList="X64">IoLibMsc.c</Filename>
-    <Filename SupArchList="X64">IoLibGcc.c</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="MSFT">IoLibMsc.c</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="GCC">IoLibGcc.c</Filename>
     <Filename SupArchList="X64">IoHighLevel.c</Filename>
     <Filename SupArchList="IPF">IoLibIpf.c</Filename>
     <Filename SupArchList="IPF">IoHighLevel.c</Filename>
diff --git a/MdePkg/Library/BaseIoLibIntrinsic/IoLibGcc.c b/MdePkg/Library/BaseIoLibIntrinsic/IoLibGcc.c
index 69fb878888..806f44bbe7 100644
--- a/MdePkg/Library/BaseIoLibIntrinsic/IoLibGcc.c
+++ b/MdePkg/Library/BaseIoLibIntrinsic/IoLibGcc.c
@@ -10,7 +10,7 @@
   We don't advocate putting compiler specifics in libraries or drivers but there
   is no other way to make this work.
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -23,8 +23,6 @@
 
 **/
 
-#ifdef __GNUC__
-
 /**
   Reads an 8-bit MMIO register.
 
@@ -383,4 +381,3 @@ IoWrite32 (
   return Value;
 }
 
-#endif
diff --git a/MdePkg/Library/BaseIoLibIntrinsic/IoLibMsc.c b/MdePkg/Library/BaseIoLibIntrinsic/IoLibMsc.c
index d05a7fcace..2c68a3e43c 100644
--- a/MdePkg/Library/BaseIoLibIntrinsic/IoLibMsc.c
+++ b/MdePkg/Library/BaseIoLibIntrinsic/IoLibMsc.c
@@ -8,7 +8,7 @@
   We don't advocate putting compiler specifics in libraries or drivers but there
   is no other way to make this work.
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -22,8 +22,6 @@
 **/
 
 
-#if _MSC_EXTENSIONS
-
 //
 // Microsoft Visual Studio 7.1 Function Prototypes for I/O Intrinsics
 //
@@ -426,4 +424,3 @@ MmioWrite64 (
   return *(volatile UINT64*)Address = Value;
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/BaseLib.msa b/MdePkg/Library/BaseLib/BaseLib.msa
index fa8e8ed4dd..185810f397 100644
--- a/MdePkg/Library/BaseLib/BaseLib.msa
+++ b/MdePkg/Library/BaseLib/BaseLib.msa
@@ -473,8 +473,8 @@
     <Filename SupArchList="X64">X64/FlushCacheLine.asm</Filename>
     <Filename SupArchList="X64" ToolChainFamily="MSFT">X64/InterlockedIncrement.c</Filename>
     <Filename SupArchList="X64" ToolChainFamily="MSFT">X64/InterlockedDecrement.c</Filename>
-    <Filename SupArchList="X64">X64/InterlockedCompareExchange32.asm</Filename>
-    <Filename SupArchList="X64">X64/InterlockedCompareExchange64.asm</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="MSFT">X64/InterlockedCompareExchange32.asm</Filename>
+    <Filename SupArchList="X64" ToolChainFamily="MSFT">X64/InterlockedCompareExchange64.asm</Filename>
     <Filename SupArchList="X64">X64/EnableInterrupts.asm</Filename>
     <Filename SupArchList="X64">X64/DisableInterrupts.asm</Filename>
     <Filename SupArchList="X64">X64/EnableDisableInterrupts.asm</Filename>
diff --git a/MdePkg/Library/BaseLib/Ia32/ARShiftU64.c b/MdePkg/Library/BaseLib/Ia32/ARShiftU64.c
index 3c4a5b3f51..01e0bdf7a2 100644
--- a/MdePkg/Library/BaseLib/Ia32/ARShiftU64.c
+++ b/MdePkg/Library/BaseLib/Ia32/ARShiftU64.c
@@ -1,7 +1,7 @@
 /** @file
   64-bit arithmetic right shift function for IA-32.
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINT64
 EFIAPI
 InternalMathARShiftU64 (
@@ -33,4 +31,3 @@ InternalMathARShiftU64 (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/CpuBreakpoint.c b/MdePkg/Library/BaseLib/Ia32/CpuBreakpoint.c
index e13f13f78b..fc5b63734b 100644
--- a/MdePkg/Library/BaseLib/Ia32/CpuBreakpoint.c
+++ b/MdePkg/Library/BaseLib/Ia32/CpuBreakpoint.c
@@ -1,7 +1,7 @@
 /** @file
   CpuBreakpoint function.
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 //
 // Microsoft Visual Studio 7.1 Function Prototypes for I/O Intrinsics
 //
@@ -30,4 +28,3 @@ CpuBreakpoint (
   __debugbreak ();
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/CpuFlushTlb.c b/MdePkg/Library/BaseLib/Ia32/CpuFlushTlb.c
index 6845117e33..2eea64d05c 100644
--- a/MdePkg/Library/BaseLib/Ia32/CpuFlushTlb.c
+++ b/MdePkg/Library/BaseLib/Ia32/CpuFlushTlb.c
@@ -1,7 +1,7 @@
 /** @file
   CpuFlushTlb function.
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 VOID
 EFIAPI
 CpuFlushTlb (
@@ -26,4 +24,3 @@ CpuFlushTlb (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/CpuId.c b/MdePkg/Library/BaseLib/Ia32/CpuId.c
index 189e9e6be0..64b215a462 100644
--- a/MdePkg/Library/BaseLib/Ia32/CpuId.c
+++ b/MdePkg/Library/BaseLib/Ia32/CpuId.c
@@ -1,7 +1,7 @@
 /** @file
   AsmCpuid function.
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINT32
 EFIAPI
 AsmCpuid (
@@ -49,4 +47,3 @@ SkipEdx:
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/CpuIdEx.c b/MdePkg/Library/BaseLib/Ia32/CpuIdEx.c
index 6ebbcbcf10..8e475d833d 100644
--- a/MdePkg/Library/BaseLib/Ia32/CpuIdEx.c
+++ b/MdePkg/Library/BaseLib/Ia32/CpuIdEx.c
@@ -1,7 +1,7 @@
 /** @file
   AsmCpuidEx function.
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINT32
 EFIAPI
 AsmCpuidEx (
@@ -50,5 +48,3 @@ SkipEdx:
     mov     eax, Index
   }
 }
-
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/CpuPause.c b/MdePkg/Library/BaseLib/Ia32/CpuPause.c
index e5206987d5..0a4c101884 100644
--- a/MdePkg/Library/BaseLib/Ia32/CpuPause.c
+++ b/MdePkg/Library/BaseLib/Ia32/CpuPause.c
@@ -1,7 +1,7 @@
 /** @file
   CpuPause function.
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 VOID
 EFIAPI
 CpuPause (
@@ -25,4 +23,3 @@ CpuPause (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/CpuSleep.c b/MdePkg/Library/BaseLib/Ia32/CpuSleep.c
index f813ff93f0..fa00381bd0 100644
--- a/MdePkg/Library/BaseLib/Ia32/CpuSleep.c
+++ b/MdePkg/Library/BaseLib/Ia32/CpuSleep.c
@@ -1,7 +1,7 @@
 /** @file
   CpuSleep function.
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 VOID
 EFIAPI
 CpuSleep (
@@ -25,4 +23,3 @@ CpuSleep (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/DisableInterrupts.c b/MdePkg/Library/BaseLib/Ia32/DisableInterrupts.c
index 99d9e29d8a..5d694090f6 100644
--- a/MdePkg/Library/BaseLib/Ia32/DisableInterrupts.c
+++ b/MdePkg/Library/BaseLib/Ia32/DisableInterrupts.c
@@ -1,7 +1,7 @@
 /** @file
   DisableInterrupts function.
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 VOID
 EFIAPI
 DisableInterrupts (
@@ -25,4 +23,3 @@ DisableInterrupts (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/DisablePaging32.c b/MdePkg/Library/BaseLib/Ia32/DisablePaging32.c
index 2e7f928bce..58597ce133 100644
--- a/MdePkg/Library/BaseLib/Ia32/DisablePaging32.c
+++ b/MdePkg/Library/BaseLib/Ia32/DisablePaging32.c
@@ -1,7 +1,7 @@
 /** @file
   AsmDisablePaging32 function.
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 __declspec (naked)
 VOID
 EFIAPI
@@ -46,4 +44,3 @@ InternalX86DisablePaging32 (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/DivU64x32.c b/MdePkg/Library/BaseLib/Ia32/DivU64x32.c
index dd732158c8..7ec3c2d985 100644
--- a/MdePkg/Library/BaseLib/Ia32/DivU64x32.c
+++ b/MdePkg/Library/BaseLib/Ia32/DivU64x32.c
@@ -1,7 +1,7 @@
 /** @file
   Calculate the quotient of a 64-bit integer by a 32-bit integer
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINT64
 EFIAPI
 InternalMathDivU64x32 (
@@ -33,4 +31,3 @@ InternalMathDivU64x32 (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/DivU64x32Remainder.c b/MdePkg/Library/BaseLib/Ia32/DivU64x32Remainder.c
index b7e354bda8..8f74930618 100644
--- a/MdePkg/Library/BaseLib/Ia32/DivU64x32Remainder.c
+++ b/MdePkg/Library/BaseLib/Ia32/DivU64x32Remainder.c
@@ -1,7 +1,7 @@
 /** @file
   Set error flag for all division functions
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINT64
 EFIAPI
 InternalMathDivRemU64x32 (
@@ -38,4 +36,3 @@ RemainderNull:
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/DivU64x64Remainder.c b/MdePkg/Library/BaseLib/Ia32/DivU64x64Remainder.c
index 2a893147c7..14b2f2789b 100644
--- a/MdePkg/Library/BaseLib/Ia32/DivU64x64Remainder.c
+++ b/MdePkg/Library/BaseLib/Ia32/DivU64x64Remainder.c
@@ -2,7 +2,7 @@
   Calculate the quotient of a 64-bit integer by a 64-bit integer and returns
   both the quotient and the remainderSet error flag for all division functions
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -13,8 +13,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINT64
 EFIAPI
 InternalMathDivRemU64x64 (
@@ -66,4 +64,3 @@ Return:
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/EnableDisableInterrupts.c b/MdePkg/Library/BaseLib/Ia32/EnableDisableInterrupts.c
index d6b0370e5f..fe6ebf78dc 100644
--- a/MdePkg/Library/BaseLib/Ia32/EnableDisableInterrupts.c
+++ b/MdePkg/Library/BaseLib/Ia32/EnableDisableInterrupts.c
@@ -1,7 +1,7 @@
 /** @file
   EnableDisableInterrupts function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 VOID
 EFIAPI
 EnableDisableInterrupts (
@@ -28,4 +26,3 @@ EnableDisableInterrupts (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/EnableInterrupts.c b/MdePkg/Library/BaseLib/Ia32/EnableInterrupts.c
index bead074dbb..2770e637b5 100644
--- a/MdePkg/Library/BaseLib/Ia32/EnableInterrupts.c
+++ b/MdePkg/Library/BaseLib/Ia32/EnableInterrupts.c
@@ -1,7 +1,7 @@
 /** @file
   EnableInterrupts function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 VOID
 EFIAPI
 EnableInterrupts (
@@ -25,4 +23,3 @@ EnableInterrupts (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/EnablePaging32.c b/MdePkg/Library/BaseLib/Ia32/EnablePaging32.c
index 146089cab6..7aecd01790 100644
--- a/MdePkg/Library/BaseLib/Ia32/EnablePaging32.c
+++ b/MdePkg/Library/BaseLib/Ia32/EnablePaging32.c
@@ -1,7 +1,7 @@
 /** @file
   AsmEnablePaging32 function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 __declspec (naked)
 VOID
 EFIAPI
@@ -46,4 +44,3 @@ InternalX86EnablePaging32 (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/FlushCacheLine.c b/MdePkg/Library/BaseLib/Ia32/FlushCacheLine.c
index 6da213a6a9..4b3c7f7b62 100644
--- a/MdePkg/Library/BaseLib/Ia32/FlushCacheLine.c
+++ b/MdePkg/Library/BaseLib/Ia32/FlushCacheLine.c
@@ -1,7 +1,7 @@
 /** @file
   AsmFlushCacheLine function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 VOID *
 EFIAPI
 AsmFlushCacheLine (
@@ -26,4 +24,3 @@ AsmFlushCacheLine (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/FxRestore.c b/MdePkg/Library/BaseLib/Ia32/FxRestore.c
index e51b882d7b..155a1599b1 100644
--- a/MdePkg/Library/BaseLib/Ia32/FxRestore.c
+++ b/MdePkg/Library/BaseLib/Ia32/FxRestore.c
@@ -1,7 +1,7 @@
 /** @file
   AsmFxRestore function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 VOID
 EFIAPI
 InternalX86FxRestore (
@@ -26,4 +24,3 @@ InternalX86FxRestore (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/FxSave.c b/MdePkg/Library/BaseLib/Ia32/FxSave.c
index 8a34023600..9a013e11be 100644
--- a/MdePkg/Library/BaseLib/Ia32/FxSave.c
+++ b/MdePkg/Library/BaseLib/Ia32/FxSave.c
@@ -1,7 +1,7 @@
 /** @file
   AsmFxSave function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 VOID
 EFIAPI
 InternalX86FxSave (
@@ -26,4 +24,3 @@ InternalX86FxSave (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange32.c b/MdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange32.c
index 244089617e..07be35e1df 100644
--- a/MdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange32.c
+++ b/MdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange32.c
@@ -1,7 +1,7 @@
 /** @file
   InterlockedCompareExchange32 function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINT32
 EFIAPI
 InternalSyncCompareExchange32 (
@@ -30,4 +28,3 @@ InternalSyncCompareExchange32 (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange64.c b/MdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange64.c
index 5bddf71432..d3747bed2c 100644
--- a/MdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange64.c
+++ b/MdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange64.c
@@ -1,7 +1,7 @@
 /** @file
   InterlockedCompareExchange64 function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINT64
 EFIAPI
 InternalSyncCompareExchange64 (
@@ -31,5 +29,3 @@ InternalSyncCompareExchange64 (
     lock    cmpxchg8b   qword ptr [esi]
   }
 }
-
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/InterlockedDecrement.c b/MdePkg/Library/BaseLib/Ia32/InterlockedDecrement.c
index f0d5fb249a..c3854e96be 100644
--- a/MdePkg/Library/BaseLib/Ia32/InterlockedDecrement.c
+++ b/MdePkg/Library/BaseLib/Ia32/InterlockedDecrement.c
@@ -1,7 +1,7 @@
 /** @file
   InterlockedDecrement function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINT32
 EFIAPI
 InternalSyncDecrement (
@@ -26,5 +24,3 @@ InternalSyncDecrement (
     mov     eax, [eax]
   }
 }
-
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/InterlockedIncrement.c b/MdePkg/Library/BaseLib/Ia32/InterlockedIncrement.c
index 0854ace86f..4fa35c6e08 100644
--- a/MdePkg/Library/BaseLib/Ia32/InterlockedIncrement.c
+++ b/MdePkg/Library/BaseLib/Ia32/InterlockedIncrement.c
@@ -1,7 +1,7 @@
 /** @file
   InterLockedIncrement function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINT32
 EFIAPI
 InternalSyncIncrement (
@@ -27,4 +25,3 @@ InternalSyncIncrement (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/Invd.c b/MdePkg/Library/BaseLib/Ia32/Invd.c
index 113bdd6975..2fdfd28e22 100644
--- a/MdePkg/Library/BaseLib/Ia32/Invd.c
+++ b/MdePkg/Library/BaseLib/Ia32/Invd.c
@@ -1,7 +1,7 @@
 /** @file
   AsmInvd function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 VOID
 EFIAPI
 AsmInvd (
@@ -25,4 +23,3 @@ AsmInvd (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/LRotU64.c b/MdePkg/Library/BaseLib/Ia32/LRotU64.c
index e45d2dea49..7761b9549b 100644
--- a/MdePkg/Library/BaseLib/Ia32/LRotU64.c
+++ b/MdePkg/Library/BaseLib/Ia32/LRotU64.c
@@ -1,7 +1,7 @@
 /** @file
   64-bit left rotation for Ia32
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINT64
 EFIAPI
 InternalMathLRotU64 (
@@ -36,4 +34,3 @@ InternalMathLRotU64 (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/LShiftU64.c b/MdePkg/Library/BaseLib/Ia32/LShiftU64.c
index 64f9e373b7..193a41222f 100644
--- a/MdePkg/Library/BaseLib/Ia32/LShiftU64.c
+++ b/MdePkg/Library/BaseLib/Ia32/LShiftU64.c
@@ -1,7 +1,7 @@
 /** @file
   64-bit left shift function for IA-32.
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINT64
 EFIAPI
 InternalMathLShiftU64 (
@@ -33,4 +31,3 @@ InternalMathLShiftU64 (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/LongJump.c b/MdePkg/Library/BaseLib/Ia32/LongJump.c
index 34447732a1..0e58625a65 100644
--- a/MdePkg/Library/BaseLib/Ia32/LongJump.c
+++ b/MdePkg/Library/BaseLib/Ia32/LongJump.c
@@ -1,7 +1,7 @@
 /** @file
   Implementation of _LongJump() on IA-32.
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 __declspec (naked)
 VOID
 EFIAPI
@@ -35,4 +33,3 @@ InternalLongJump (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/ModU64x32.c b/MdePkg/Library/BaseLib/Ia32/ModU64x32.c
index 2433bcc165..f935632f6b 100644
--- a/MdePkg/Library/BaseLib/Ia32/ModU64x32.c
+++ b/MdePkg/Library/BaseLib/Ia32/ModU64x32.c
@@ -1,7 +1,7 @@
 /** @file
   Calculate the remainder of a 64-bit integer by a 32-bit integer
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINT32
 EFIAPI
 InternalMathModU64x32 (
@@ -31,5 +29,3 @@ InternalMathModU64x32 (
     mov     eax, edx
   }
 }
-
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/Monitor.c b/MdePkg/Library/BaseLib/Ia32/Monitor.c
index ec29a0df2d..e1f52b99be 100644
--- a/MdePkg/Library/BaseLib/Ia32/Monitor.c
+++ b/MdePkg/Library/BaseLib/Ia32/Monitor.c
@@ -1,7 +1,7 @@
 /** @file
   AsmMonitor function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINTN
 EFIAPI
 AsmMonitor (
@@ -32,4 +30,3 @@ AsmMonitor (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/MultU64x32.c b/MdePkg/Library/BaseLib/Ia32/MultU64x32.c
index a2444e9af4..ea0643d830 100644
--- a/MdePkg/Library/BaseLib/Ia32/MultU64x32.c
+++ b/MdePkg/Library/BaseLib/Ia32/MultU64x32.c
@@ -1,7 +1,7 @@
 /** @file
   Calculate the product of a 64-bit integer and a 32-bit integer
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINT64
 EFIAPI
 InternalMathMultU64x32 (
@@ -30,4 +28,3 @@ InternalMathMultU64x32 (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/MultU64x64.c b/MdePkg/Library/BaseLib/Ia32/MultU64x64.c
index 71757bddc0..a014b4406e 100644
--- a/MdePkg/Library/BaseLib/Ia32/MultU64x64.c
+++ b/MdePkg/Library/BaseLib/Ia32/MultU64x64.c
@@ -1,7 +1,7 @@
 /** @file
   Calculate the product of a 64-bit integer and another 64-bit integer
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINT64
 EFIAPI
 InternalMathMultU64x64 (
@@ -34,4 +32,3 @@ InternalMathMultU64x64 (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/Mwait.c b/MdePkg/Library/BaseLib/Ia32/Mwait.c
index b6ad777939..0256f2c841 100644
--- a/MdePkg/Library/BaseLib/Ia32/Mwait.c
+++ b/MdePkg/Library/BaseLib/Ia32/Mwait.c
@@ -1,7 +1,7 @@
 /** @file
   AsmMwait function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINTN
 EFIAPI
 AsmMwait (
@@ -30,4 +28,3 @@ AsmMwait (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/RRotU64.c b/MdePkg/Library/BaseLib/Ia32/RRotU64.c
index 78ac484afc..f91fc378a2 100644
--- a/MdePkg/Library/BaseLib/Ia32/RRotU64.c
+++ b/MdePkg/Library/BaseLib/Ia32/RRotU64.c
@@ -1,7 +1,7 @@
 /** @file
   64-bit right rotation for Ia32
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINT64
 EFIAPI
 InternalMathRRotU64 (
@@ -36,4 +34,3 @@ InternalMathRRotU64 (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/RShiftU64.c b/MdePkg/Library/BaseLib/Ia32/RShiftU64.c
index a57539d553..cc878e878c 100644
--- a/MdePkg/Library/BaseLib/Ia32/RShiftU64.c
+++ b/MdePkg/Library/BaseLib/Ia32/RShiftU64.c
@@ -1,7 +1,7 @@
 /** @file
   64-bit logical right shift function for IA-32
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINT64
 EFIAPI
 InternalMathRShiftU64 (
@@ -33,4 +31,3 @@ InternalMathRShiftU64 (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadCr0.c b/MdePkg/Library/BaseLib/Ia32/ReadCr0.c
index 4931775bef..ce43048a36 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadCr0.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadCr0.c
@@ -1,7 +1,7 @@
 /** @file
   AsmReadCr0 function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINTN
 EFIAPI
 AsmReadCr0 (
@@ -24,5 +22,3 @@ AsmReadCr0 (
     mov     eax, cr0
   }
 }
-
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadCr2.c b/MdePkg/Library/BaseLib/Ia32/ReadCr2.c
index 09a4230fd5..2a61e1bbb6 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadCr2.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadCr2.c
@@ -1,7 +1,7 @@
 /** @file
   AsmReadCr2 function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINTN
 EFIAPI
 AsmReadCr2 (
@@ -25,4 +23,3 @@ AsmReadCr2 (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadCr3.c b/MdePkg/Library/BaseLib/Ia32/ReadCr3.c
index 02462efdfb..c151accabb 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadCr3.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadCr3.c
@@ -1,7 +1,7 @@
 /** @file
   AsmReadCr3 function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINTN
 EFIAPI
 AsmReadCr3 (
@@ -25,4 +23,3 @@ AsmReadCr3 (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadCr4.c b/MdePkg/Library/BaseLib/Ia32/ReadCr4.c
index bc5dd727f0..c88dd311e1 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadCr4.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadCr4.c
@@ -1,7 +1,7 @@
 /** @file
   AsmReadCr4 function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINTN
 EFIAPI
 AsmReadCr4 (
@@ -27,4 +25,3 @@ AsmReadCr4 (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadCs.c b/MdePkg/Library/BaseLib/Ia32/ReadCs.c
index 5634e49530..f93e16cb93 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadCs.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadCs.c
@@ -1,7 +1,7 @@
 /** @file
   AsmReadCs function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINT16
 EFIAPI
 AsmReadCs (
@@ -26,4 +24,3 @@ AsmReadCs (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr0.c b/MdePkg/Library/BaseLib/Ia32/ReadDr0.c
index cc91973295..b3ff929552 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr0.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadDr0.c
@@ -1,7 +1,7 @@
 /** @file
   AsmReadDr0 function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINTN
 EFIAPI
 AsmReadDr0 (
@@ -25,4 +23,3 @@ AsmReadDr0 (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr1.c b/MdePkg/Library/BaseLib/Ia32/ReadDr1.c
index 10e8a48081..6d9f8999b6 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr1.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadDr1.c
@@ -1,7 +1,7 @@
 /** @file
   AsmReadDr1 function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINTN
 EFIAPI
 AsmReadDr1 (
@@ -25,4 +23,3 @@ AsmReadDr1 (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr2.c b/MdePkg/Library/BaseLib/Ia32/ReadDr2.c
index bbacec40bb..638bf8f7ae 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr2.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadDr2.c
@@ -1,7 +1,7 @@
 /** @file
   AsmReadDr2 function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINTN
 EFIAPI
 AsmReadDr2 (
@@ -25,4 +23,3 @@ AsmReadDr2 (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr3.c b/MdePkg/Library/BaseLib/Ia32/ReadDr3.c
index c4390d01b6..82a3f860be 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr3.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadDr3.c
@@ -1,7 +1,7 @@
 /** @file
   AsmReadDr3 function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINTN
 EFIAPI
 AsmReadDr3 (
@@ -25,4 +23,3 @@ AsmReadDr3 (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr4.c b/MdePkg/Library/BaseLib/Ia32/ReadDr4.c
index fab9f67e0e..d68de88ba5 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr4.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadDr4.c
@@ -1,7 +1,7 @@
 /** @file
   AsmReadDr4 function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINTN
 EFIAPI
 AsmReadDr4 (
@@ -27,4 +25,3 @@ AsmReadDr4 (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr5.c b/MdePkg/Library/BaseLib/Ia32/ReadDr5.c
index 6b0db98659..175e6f641c 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr5.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadDr5.c
@@ -1,7 +1,7 @@
 /** @file
   AsmReadDr5 function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINTN
 EFIAPI
 AsmReadDr5 (
@@ -27,4 +25,3 @@ AsmReadDr5 (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr6.c b/MdePkg/Library/BaseLib/Ia32/ReadDr6.c
index 8a84658222..28a918283a 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr6.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadDr6.c
@@ -1,7 +1,7 @@
 /** @file
   AsmReadDr6 function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINTN
 EFIAPI
 AsmReadDr6 (
@@ -25,4 +23,3 @@ AsmReadDr6 (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr7.c b/MdePkg/Library/BaseLib/Ia32/ReadDr7.c
index 02794f8b8b..b0ac10fe96 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr7.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadDr7.c
@@ -1,7 +1,7 @@
 /** @file
   AsmReadDr7 function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINTN
 EFIAPI
 AsmReadDr7 (
@@ -25,4 +23,3 @@ AsmReadDr7 (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDs.c b/MdePkg/Library/BaseLib/Ia32/ReadDs.c
index c757928372..13990b5195 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadDs.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadDs.c
@@ -1,7 +1,7 @@
 /** @file
   AsmReadDs function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINT16
 EFIAPI
 AsmReadDs (
@@ -26,4 +24,3 @@ AsmReadDs (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadEflags.c b/MdePkg/Library/BaseLib/Ia32/ReadEflags.c
index 49901b08d6..c927d66a59 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadEflags.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadEflags.c
@@ -1,7 +1,7 @@
 /** @file
   AsmReadEflags function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINTN
 EFIAPI
 AsmReadEflags (
@@ -26,4 +24,3 @@ AsmReadEflags (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadEs.c b/MdePkg/Library/BaseLib/Ia32/ReadEs.c
index dcd04eeb16..2fa183b00a 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadEs.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadEs.c
@@ -1,7 +1,7 @@
 /** @file
   AsmReadEs function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINT16
 EFIAPI
 AsmReadEs (
@@ -26,4 +24,3 @@ AsmReadEs (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadFs.c b/MdePkg/Library/BaseLib/Ia32/ReadFs.c
index 73f6d0e332..d142e4d370 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadFs.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadFs.c
@@ -1,7 +1,7 @@
 /** @file
   AsmReadFs function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINT16
 EFIAPI
 AsmReadFs (
@@ -26,4 +24,3 @@ AsmReadFs (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadGdtr.c b/MdePkg/Library/BaseLib/Ia32/ReadGdtr.c
index f98e9f85ce..86bb10d12e 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadGdtr.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadGdtr.c
@@ -1,7 +1,7 @@
 /** @file
   AsmReadGdtr function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 VOID
 EFIAPI
 InternalX86ReadGdtr (
@@ -26,4 +24,3 @@ InternalX86ReadGdtr (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadGs.c b/MdePkg/Library/BaseLib/Ia32/ReadGs.c
index 47da6e716a..3cebfd60cb 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadGs.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadGs.c
@@ -1,7 +1,7 @@
 /** @file
   AsmReadGs function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINT16
 EFIAPI
 AsmReadGs (
@@ -26,4 +24,3 @@ AsmReadGs (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadIdtr.c b/MdePkg/Library/BaseLib/Ia32/ReadIdtr.c
index d39f72f4f9..e5885cce59 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadIdtr.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadIdtr.c
@@ -1,7 +1,7 @@
 /** @file
   AsmReadIdtr function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 VOID
 EFIAPI
 InternalX86ReadIdtr (
@@ -25,5 +23,3 @@ InternalX86ReadIdtr (
     sidt    fword ptr [eax]
   }
 }
-
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadLdtr.c b/MdePkg/Library/BaseLib/Ia32/ReadLdtr.c
index df3f983108..0950f8bad5 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadLdtr.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadLdtr.c
@@ -1,7 +1,7 @@
 /** @file
   AsmReadLdtr function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINT16
 EFIAPI
 AsmReadLdtr (
@@ -25,4 +23,3 @@ AsmReadLdtr (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm0.c b/MdePkg/Library/BaseLib/Ia32/ReadMm0.c
index 16ecd24e7e..d42f95e8b5 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm0.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadMm0.c
@@ -1,7 +1,7 @@
 /** @file
   AsmReadMm0 function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINT64
 EFIAPI
 AsmReadMm0 (
@@ -30,4 +28,3 @@ AsmReadMm0 (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm1.c b/MdePkg/Library/BaseLib/Ia32/ReadMm1.c
index 7026e18d52..e4d0e08b93 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm1.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadMm1.c
@@ -1,7 +1,7 @@
 /** @file
   AsmReadMm1 function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINT64
 EFIAPI
 AsmReadMm1 (
@@ -30,4 +28,3 @@ AsmReadMm1 (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm2.c b/MdePkg/Library/BaseLib/Ia32/ReadMm2.c
index 33188eb11e..c2e49209b8 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm2.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadMm2.c
@@ -1,7 +1,7 @@
 /** @file
   AsmReadMm2 function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINT64
 EFIAPI
 AsmReadMm2 (
@@ -30,4 +28,3 @@ AsmReadMm2 (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm3.c b/MdePkg/Library/BaseLib/Ia32/ReadMm3.c
index 2690e00dda..680db3be05 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm3.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadMm3.c
@@ -1,7 +1,7 @@
 /** @file
   AsmReadMm3 function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINT64
 EFIAPI
 AsmReadMm3 (
@@ -30,4 +28,3 @@ AsmReadMm3 (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm4.c b/MdePkg/Library/BaseLib/Ia32/ReadMm4.c
index 6e8f9d02f1..b51619cb99 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm4.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadMm4.c
@@ -1,7 +1,7 @@
 /** @file
   AsmReadMm4 function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINT64
 EFIAPI
 AsmReadMm4 (
@@ -30,4 +28,3 @@ AsmReadMm4 (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm5.c b/MdePkg/Library/BaseLib/Ia32/ReadMm5.c
index ed3d37c416..a502e38d96 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm5.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadMm5.c
@@ -1,7 +1,7 @@
 /** @file
   AsmReadMm5 function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINT64
 EFIAPI
 AsmReadMm5 (
@@ -30,4 +28,3 @@ AsmReadMm5 (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm6.c b/MdePkg/Library/BaseLib/Ia32/ReadMm6.c
index 9aa892e89c..a97aae68ed 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm6.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadMm6.c
@@ -1,7 +1,7 @@
 /** @file
   AsmReadMm6 function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINT64
 EFIAPI
 AsmReadMm6 (
@@ -30,4 +28,3 @@ AsmReadMm6 (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm7.c b/MdePkg/Library/BaseLib/Ia32/ReadMm7.c
index 93ddfdb1be..4ae5d63de5 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm7.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadMm7.c
@@ -1,7 +1,7 @@
 /** @file
   AsmReadMm7 function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINT64
 EFIAPI
 AsmReadMm7 (
@@ -30,4 +28,3 @@ AsmReadMm7 (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMsr64.c b/MdePkg/Library/BaseLib/Ia32/ReadMsr64.c
index 3b4d0ca480..fb7554805e 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadMsr64.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadMsr64.c
@@ -1,7 +1,7 @@
 /** @file
   AsmReadMsr64 function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINT64
 EFIAPI
 AsmReadMsr64 (
@@ -26,4 +24,3 @@ AsmReadMsr64 (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadPmc.c b/MdePkg/Library/BaseLib/Ia32/ReadPmc.c
index bf5f5d8537..a8b647dfbd 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadPmc.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadPmc.c
@@ -1,7 +1,7 @@
 /** @file
   AsmReadPmc function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINT64
 EFIAPI
 AsmReadPmc (
@@ -26,4 +24,3 @@ AsmReadPmc (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadSs.c b/MdePkg/Library/BaseLib/Ia32/ReadSs.c
index 9fd5d9669e..62ad42453d 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadSs.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadSs.c
@@ -1,7 +1,7 @@
 /** @file
   AsmReadSs function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINT16
 EFIAPI
 AsmReadSs (
@@ -26,4 +24,3 @@ AsmReadSs (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadTr.c b/MdePkg/Library/BaseLib/Ia32/ReadTr.c
index 7f7f1d5cdf..5068c7f0a6 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadTr.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadTr.c
@@ -1,7 +1,7 @@
 /** @file
   AsmReadTr function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINT16
 EFIAPI
 AsmReadTr (
@@ -25,4 +23,3 @@ AsmReadTr (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadTsc.c b/MdePkg/Library/BaseLib/Ia32/ReadTsc.c
index 54cbd90aad..2fa89f934d 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadTsc.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadTsc.c
@@ -1,7 +1,7 @@
 /** @file
   AsmReadTsc function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINT64
 EFIAPI
 AsmReadTsc (
@@ -25,4 +23,3 @@ AsmReadTsc (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/SetJump.c b/MdePkg/Library/BaseLib/Ia32/SetJump.c
index 9854334eb2..4f4dbca057 100644
--- a/MdePkg/Library/BaseLib/Ia32/SetJump.c
+++ b/MdePkg/Library/BaseLib/Ia32/SetJump.c
@@ -1,7 +1,7 @@
 /** @file
   Implementation of SetJump() on IA-32.
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 VOID
 EFIAPI
 InternalAssertJumpBuffer (
@@ -26,7 +24,7 @@ EFIAPI
 SetJump (
   OUT     BASE_LIBRARY_JUMP_BUFFER  *JumpBuffer
   )
-{ 
+{
   _asm {
     push    [esp + 4]
     call    InternalAssertJumpBuffer
@@ -44,4 +42,3 @@ SetJump (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/SwapBytes64.c b/MdePkg/Library/BaseLib/Ia32/SwapBytes64.c
index acd0b82841..1dd6adb68d 100644
--- a/MdePkg/Library/BaseLib/Ia32/SwapBytes64.c
+++ b/MdePkg/Library/BaseLib/Ia32/SwapBytes64.c
@@ -1,7 +1,7 @@
 /** @file
   Implementation of 64-bit swap bytes
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINT64
 EFIAPI
 InternalMathSwapBytes64 (
@@ -28,4 +26,3 @@ InternalMathSwapBytes64 (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/Wbinvd.c b/MdePkg/Library/BaseLib/Ia32/Wbinvd.c
index 25e794d170..ae7576645d 100644
--- a/MdePkg/Library/BaseLib/Ia32/Wbinvd.c
+++ b/MdePkg/Library/BaseLib/Ia32/Wbinvd.c
@@ -1,7 +1,7 @@
 /** @file
   AsmWbinvd function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 VOID
 EFIAPI
 AsmWbinvd (
@@ -25,4 +23,3 @@ AsmWbinvd (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteCr0.c b/MdePkg/Library/BaseLib/Ia32/WriteCr0.c
index a120250fd7..909b202907 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteCr0.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteCr0.c
@@ -1,7 +1,7 @@
 /** @file
   AsmWriteCr0 function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINTN
 EFIAPI
 AsmWriteCr0 (
@@ -26,4 +24,3 @@ AsmWriteCr0 (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteCr2.c b/MdePkg/Library/BaseLib/Ia32/WriteCr2.c
index 45f1faa12f..85921e0961 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteCr2.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteCr2.c
@@ -1,7 +1,7 @@
 /** @file
   AsmWriteCr2 function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINTN
 EFIAPI
 AsmWriteCr2 (
@@ -26,4 +24,3 @@ AsmWriteCr2 (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteCr3.c b/MdePkg/Library/BaseLib/Ia32/WriteCr3.c
index e4606a7bc4..0714d8e76f 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteCr3.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteCr3.c
@@ -1,7 +1,7 @@
 /** @file
   AsmWriteCr3 function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINTN
 EFIAPI
 AsmWriteCr3 (
@@ -26,4 +24,3 @@ AsmWriteCr3 (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteCr4.c b/MdePkg/Library/BaseLib/Ia32/WriteCr4.c
index 772a463ef5..e0f4bf0a88 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteCr4.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteCr4.c
@@ -1,7 +1,7 @@
 /** @file
   AsmWriteCr4 function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINTN
 EFIAPI
 AsmWriteCr4 (
@@ -28,4 +26,3 @@ AsmWriteCr4 (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr0.c b/MdePkg/Library/BaseLib/Ia32/WriteDr0.c
index e511a6e0e4..f98098076c 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr0.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteDr0.c
@@ -1,7 +1,7 @@
 /** @file
   AsmWriteDr0 function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINTN
 EFIAPI
 AsmWriteDr0 (
@@ -26,4 +24,3 @@ AsmWriteDr0 (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr1.c b/MdePkg/Library/BaseLib/Ia32/WriteDr1.c
index 74f4877ac0..4f29303218 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr1.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteDr1.c
@@ -1,7 +1,7 @@
 /** @file
   AsmWriteDr1 function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINTN
 EFIAPI
 AsmWriteDr1 (
@@ -26,4 +24,3 @@ AsmWriteDr1 (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr2.c b/MdePkg/Library/BaseLib/Ia32/WriteDr2.c
index 4ecbcb1795..190fb228a8 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr2.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteDr2.c
@@ -1,7 +1,7 @@
 /** @file
   AsmWriteDr2 function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINTN
 EFIAPI
 AsmWriteDr2 (
@@ -26,4 +24,3 @@ AsmWriteDr2 (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr3.c b/MdePkg/Library/BaseLib/Ia32/WriteDr3.c
index f8a4b45058..ad2d1ad75a 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr3.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteDr3.c
@@ -1,7 +1,7 @@
 /** @file
   AsmWriteDr3 function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINTN
 EFIAPI
 AsmWriteDr3 (
@@ -26,4 +24,3 @@ AsmWriteDr3 (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr4.c b/MdePkg/Library/BaseLib/Ia32/WriteDr4.c
index 546f92cf89..27862486be 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr4.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteDr4.c
@@ -1,7 +1,7 @@
 /** @file
   AsmWriteDr4 function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINTN
 EFIAPI
 AsmWriteDr4 (
@@ -28,4 +26,3 @@ AsmWriteDr4 (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr5.c b/MdePkg/Library/BaseLib/Ia32/WriteDr5.c
index e2f72e3e92..c6e118e9fa 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr5.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteDr5.c
@@ -1,7 +1,7 @@
 /** @file
   AsmWriteDr5 function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINTN
 EFIAPI
 AsmWriteDr5 (
@@ -28,4 +26,3 @@ AsmWriteDr5 (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr6.c b/MdePkg/Library/BaseLib/Ia32/WriteDr6.c
index 1b50f4deb9..bc7d8048b0 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr6.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteDr6.c
@@ -1,7 +1,7 @@
 /** @file
   AsmWriteDr6 function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINTN
 EFIAPI
 AsmWriteDr6 (
@@ -26,4 +24,3 @@ AsmWriteDr6 (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr7.c b/MdePkg/Library/BaseLib/Ia32/WriteDr7.c
index 3f5f420751..a3bd33cc95 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr7.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteDr7.c
@@ -1,7 +1,7 @@
 /** @file
   AsmWriteDr7 function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINTN
 EFIAPI
 AsmWriteDr7 (
@@ -26,4 +24,3 @@ AsmWriteDr7 (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteGdtr.c b/MdePkg/Library/BaseLib/Ia32/WriteGdtr.c
index b264651358..0f937e691b 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteGdtr.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteGdtr.c
@@ -1,7 +1,7 @@
 /** @file
   AsmWriteGdtr function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 VOID
 EFIAPI
 InternalX86WriteGdtr (
@@ -26,4 +24,3 @@ InternalX86WriteGdtr (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteIdtr.c b/MdePkg/Library/BaseLib/Ia32/WriteIdtr.c
index 4fd530fc7b..d43b204493 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteIdtr.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteIdtr.c
@@ -1,7 +1,7 @@
 /** @file
   AsmWriteIdtr function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 VOID
 EFIAPI
 InternalX86WriteIdtr (
@@ -26,4 +24,3 @@ InternalX86WriteIdtr (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteLdtr.c b/MdePkg/Library/BaseLib/Ia32/WriteLdtr.c
index 93b51424e3..c320b96e14 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteLdtr.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteLdtr.c
@@ -1,7 +1,7 @@
 /** @file
   AsmWriteLdtr function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 VOID
 EFIAPI
 AsmWriteLdtr (
@@ -27,4 +25,3 @@ AsmWriteLdtr (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm0.c b/MdePkg/Library/BaseLib/Ia32/WriteMm0.c
index c4abb9c458..d6e66d4632 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm0.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteMm0.c
@@ -1,7 +1,7 @@
 /** @file
   AsmWriteMm0 function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 VOID
 EFIAPI
 AsmWriteMm0 (
@@ -26,4 +24,3 @@ AsmWriteMm0 (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm1.c b/MdePkg/Library/BaseLib/Ia32/WriteMm1.c
index f64b338d8c..abdda7f0ae 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm1.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteMm1.c
@@ -1,7 +1,7 @@
 /** @file
   AsmWriteMm1 function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 VOID
 EFIAPI
 AsmWriteMm1 (
@@ -26,4 +24,3 @@ AsmWriteMm1 (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm2.c b/MdePkg/Library/BaseLib/Ia32/WriteMm2.c
index 238a7c4b95..d0ff1eb5f4 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm2.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteMm2.c
@@ -1,7 +1,7 @@
 /** @file
   AsmWriteMm2 function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 VOID
 EFIAPI
 AsmWriteMm2 (
@@ -26,4 +24,3 @@ AsmWriteMm2 (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm3.c b/MdePkg/Library/BaseLib/Ia32/WriteMm3.c
index 5cc01b6f27..5851fb5b50 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm3.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteMm3.c
@@ -1,7 +1,7 @@
 /** @file
   AsmWriteMm3 function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 VOID
 EFIAPI
 AsmWriteMm3 (
@@ -26,4 +24,3 @@ AsmWriteMm3 (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm4.c b/MdePkg/Library/BaseLib/Ia32/WriteMm4.c
index 0ad39dc489..50017a93f1 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm4.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteMm4.c
@@ -1,7 +1,7 @@
 /** @file
   AsmWriteMm4 function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 VOID
 EFIAPI
 AsmWriteMm4 (
@@ -25,5 +23,3 @@ AsmWriteMm4 (
     emms
   }
 }
-
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm5.c b/MdePkg/Library/BaseLib/Ia32/WriteMm5.c
index 0904dc8c70..df8d457100 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm5.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteMm5.c
@@ -1,7 +1,7 @@
 /** @file
   AsmWriteMm5 function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 VOID
 EFIAPI
 AsmWriteMm5 (
@@ -25,5 +23,3 @@ AsmWriteMm5 (
     emms
   }
 }
-
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm6.c b/MdePkg/Library/BaseLib/Ia32/WriteMm6.c
index 8003f7f503..9058565baa 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm6.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteMm6.c
@@ -1,7 +1,7 @@
 /** @file
   AsmWriteMm6 function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 VOID
 EFIAPI
 AsmWriteMm6 (
@@ -26,4 +24,3 @@ AsmWriteMm6 (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm7.c b/MdePkg/Library/BaseLib/Ia32/WriteMm7.c
index 8085d03c82..7d9a3a6ed1 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm7.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteMm7.c
@@ -1,7 +1,7 @@
 /** @file
   AsmWriteMm7 function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 VOID
 EFIAPI
 AsmWriteMm7 (
@@ -26,4 +24,3 @@ AsmWriteMm7 (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMsr64.c b/MdePkg/Library/BaseLib/Ia32/WriteMsr64.c
index 778fb9fd16..7e2fda0804 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteMsr64.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteMsr64.c
@@ -1,7 +1,7 @@
 /** @file
   AsmWriteMsr64 function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 UINT64
 EFIAPI
 AsmWriteMsr64 (
@@ -29,4 +27,3 @@ AsmWriteMsr64 (
   }
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/SetJump.c b/MdePkg/Library/BaseLib/SetJump.c
index cb77d09611..d6c2723b2a 100644
--- a/MdePkg/Library/BaseLib/SetJump.c
+++ b/MdePkg/Library/BaseLib/SetJump.c
@@ -22,7 +22,8 @@
   Checks ASSERT condition for JumpBuffer.
 
   If JumpBuffer is NULL, then ASSERT().
-  For IPF CPUs, if JumpBuffer is not aligned on a 16-byte boundary, then ASSERT().
+  If JumpBuffer is not aligned on a BASE_LIBRARY_JUMP_BUFFER_ALIGNMENT
+  boundary, then ASSERT().
 
   @param  JumpBuffer    A pointer to CPU context buffer.
 
@@ -35,7 +36,5 @@ InternalAssertJumpBuffer (
 {
   ASSERT (JumpBuffer != NULL);
 
-#ifdef MDE_CPU_IPF
-  ASSERT (((UINTN)JumpBuffer & 0xf) == 0);
-#endif
+  ASSERT (((UINTN)JumpBuffer & ((BASE_LIBRARY_JUMP_BUFFER_ALIGNMENT - 1) >> 8)) == 0);
 }
diff --git a/MdePkg/Library/BaseLib/X64/CpuBreakpoint.c b/MdePkg/Library/BaseLib/X64/CpuBreakpoint.c
index e13f13f78b..01939e9128 100644
--- a/MdePkg/Library/BaseLib/X64/CpuBreakpoint.c
+++ b/MdePkg/Library/BaseLib/X64/CpuBreakpoint.c
@@ -1,7 +1,7 @@
 /** @file
   CpuBreakpoint function.
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,7 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
 
 //
 // Microsoft Visual Studio 7.1 Function Prototypes for I/O Intrinsics
@@ -30,4 +29,3 @@ CpuBreakpoint (
   __debugbreak ();
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/X64/InterlockedCompareExchange32.c b/MdePkg/Library/BaseLib/X64/InterlockedCompareExchange32.c
index c8857dbca5..4a9fe6aca6 100644
--- a/MdePkg/Library/BaseLib/X64/InterlockedCompareExchange32.c
+++ b/MdePkg/Library/BaseLib/X64/InterlockedCompareExchange32.c
@@ -1,7 +1,7 @@
 /** @file
   InterlockedCompareExchange32 function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 //
 // Microsoft Visual Studio 7.1 Function Prototypes for I/O Intrinsics
 //
@@ -36,5 +34,3 @@ InternalSyncCompareExchange32 (
   return _InterlockedCompareExchange (Value, ExchangeValue, CompareValue);
 }
 
-
-#endif
diff --git a/MdePkg/Library/BaseLib/X64/InterlockedCompareExchange64.c b/MdePkg/Library/BaseLib/X64/InterlockedCompareExchange64.c
index 8cd90b393b..bed1dc8972 100644
--- a/MdePkg/Library/BaseLib/X64/InterlockedCompareExchange64.c
+++ b/MdePkg/Library/BaseLib/X64/InterlockedCompareExchange64.c
@@ -1,7 +1,7 @@
 /** @file
   InterlockedCompareExchange64 function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 //
 // Microsoft Visual Studio 7.1 Function Prototypes for I/O Intrinsics
 //
@@ -36,4 +34,3 @@ InternalSyncCompareExchange64 (
   return _InterlockedCompareExchange64 (Value, ExchangeValue, CompareValue);
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/X64/InterlockedDecrement.c b/MdePkg/Library/BaseLib/X64/InterlockedDecrement.c
index bc171a79cc..19e6a5dc49 100644
--- a/MdePkg/Library/BaseLib/X64/InterlockedDecrement.c
+++ b/MdePkg/Library/BaseLib/X64/InterlockedDecrement.c
@@ -1,7 +1,7 @@
 /** @file
   InterlockedDecrement function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 //
 // Microsoft Visual Studio 7.1 Function Prototypes for I/O Intrinsics
 //
@@ -32,4 +30,3 @@ InternalSyncDecrement (
   return _InterlockedDecrement (Value);
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/X64/InterlockedIncrement.c b/MdePkg/Library/BaseLib/X64/InterlockedIncrement.c
index b5651bc003..eda9f79a5b 100644
--- a/MdePkg/Library/BaseLib/X64/InterlockedIncrement.c
+++ b/MdePkg/Library/BaseLib/X64/InterlockedIncrement.c
@@ -1,7 +1,7 @@
 /** @file
   InterLockedIncrement function
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 //
 // Microsoft Visual Studio 7.1 Function Prototypes for I/O Intrinsics
 //
@@ -32,4 +30,3 @@ InternalSyncIncrement (
   return _InterlockedIncrement (Value);
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/X64/ReadMsr64.c b/MdePkg/Library/BaseLib/X64/ReadMsr64.c
index b1fdff97c0..15a573fc09 100644
--- a/MdePkg/Library/BaseLib/X64/ReadMsr64.c
+++ b/MdePkg/Library/BaseLib/X64/ReadMsr64.c
@@ -1,7 +1,7 @@
 /** @file
   CpuBreakpoint function.
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 //
 // Microsoft Visual Studio 7.1 Function Prototypes for I/O Intrinsics
 //
@@ -31,4 +29,3 @@ AsmReadMsr64 (
   return __readmsr (Index);
 }
 
-#endif
diff --git a/MdePkg/Library/BaseLib/X64/WriteMsr64.c b/MdePkg/Library/BaseLib/X64/WriteMsr64.c
index 8e5d90fec4..1d1e0bc332 100644
--- a/MdePkg/Library/BaseLib/X64/WriteMsr64.c
+++ b/MdePkg/Library/BaseLib/X64/WriteMsr64.c
@@ -1,7 +1,7 @@
 /** @file
   CpuBreakpoint function.
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,8 +12,6 @@
 
 **/
 
-#if _MSC_EXTENSIONS
-
 //
 // Microsoft Visual Studio 7.1 Function Prototypes for I/O Intrinsics
 //
@@ -32,4 +30,3 @@ AsmWriteMsr64 (
   return Value;
 }
 
-#endif