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

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);
 
   //

EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Decode.c

@@ -1,6 +1,6 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation                                                         
+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
@@ -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
 //
@@ -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

EdkModulePkg/Library/EdkGenericBdsLib/DevicePath.c

@@ -1,6 +1,6 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation                                                         
+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
@@ -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;

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>

EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleService.c

@@ -1,6 +1,6 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation                                                         
+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
@@ -128,30 +128,27 @@ 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) {
+    BufferPtr = AllocatePool (CapsuleSize);
-      goto Done;
+    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
     //
     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:
+  return EFI_SUCCESS;
-  if (BufferPtr != NULL) {
-    gBS->FreePool (BufferPtr);
-  }     
-  return EFI_DEVICE_ERROR;
 }
 
 

EdkModulePkg/Universal/Network/PxeBc/Dxe/Bc.h

@@ -1,6 +1,6 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation                                                         
+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
@@ -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;

EdkModulePkg/Universal/Network/PxeBc/Dxe/bc.c

@@ -1,5 +1,6 @@
 /*++
-Copyright (c) 2006, Intel Corporation                                                         
+
+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
@@ -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.
     //
@@ -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
+            TmpIp = (EFI_IP_ADDRESS *) &AllSystemsGroup;
-            if (PxebcMode->UsingIpv6) {
-              //
-              // TBD
-              //
-            } else
-#endif
-              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.

EdkModulePkg/Universal/Network/PxeBc/Dxe/ip.h

@@ -1,6 +1,6 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation                                                         
+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
@@ -723,13 +723,6 @@ IpReceive (
   )
 ;
 
-#if 0
-VOID
-WaitForTxComplete (
-  IN PXE_BASECODE_DEVICE    *Private
-  )
-;
-#endif
 //
 // routine to cycle waiting for a receive or timeout
 //

EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_igmp.c

@@ -1,6 +1,6 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation                                                         
+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
@@ -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
   //

EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_ip.c

@@ -1,6 +1,6 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation                                                         
+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
@@ -609,14 +609,6 @@ IpReceive (
       continue;
     }
 
-#if SUPPORT_IPV6
-    if (PxeBcMode->UsingIpv6) {
-      //
-      // TBD
-      //
-    }
-#endif
-
 #define IpRxHeader  ((IPV4_HEADER *) PacketPtr)
 
     //

EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_mtftp.c

@@ -1,6 +1,6 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation                                                         
+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
@@ -1255,17 +1255,8 @@ Returns:
       BufferPtrLocal = BufferPtr + Offset;
 
     }
-    //
+
-    // special !!! do not leave enabled in saved version on Source Safe
+    if (((Status = MtftpListen (
-    // 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 (
                       Private,
                       &BufferSize,
                       BufferPtrLocal,
@@ -1278,11 +1269,11 @@ Returns:
                       LastBlock,
                       DontUseBuffer
                       )) != EFI_SUCCESS) && (Status != EFI_TIMEOUT)) {
-        return Status;
+      return Status;
-        //
+      //
-        // failed
+      // failed
-        //
+      //
-      }
+    }
     //
     // if none were received, start block is not reset
     //

EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_udp.c

@@ -1,6 +1,6 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation                                                         
+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
@@ -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;
 

EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/PxeDhcp4InitSelect.c

@@ -1,6 +1,6 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation                                                         
+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
@@ -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...
   //

EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/support.c

@@ -1,6 +1,6 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation                                                         
+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
@@ -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;

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" ToolChainFamily="MSFT">IoLibMsc.c</Filename>
-    <Filename SupArchList="IA32">IoLibGcc.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" ToolChainFamily="MSFT">IoLibMsc.c</Filename>
-    <Filename SupArchList="X64">IoLibGcc.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>

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

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

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" ToolChainFamily="MSFT">X64/InterlockedCompareExchange32.asm</Filename>
-    <Filename SupArchList="X64">X64/InterlockedCompareExchange64.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>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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 (
@@ -44,4 +42,3 @@ SetJump (
   }
 }
 
-#endif

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

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

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

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

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

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

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

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

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

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

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

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

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

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