From e5f461a8507ffcc89cd99ca43a09b76dca136ab5 Mon Sep 17 00:00:00 2001
From: vanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Thu, 15 Mar 2007 02:33:16 +0000
Subject: 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
---
 MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.msa   | 8 ++++----
 MdePkg/Library/BaseIoLibIntrinsic/IoLibGcc.c               | 5 +----
 MdePkg/Library/BaseIoLibIntrinsic/IoLibMsc.c               | 5 +----
 MdePkg/Library/BaseLib/BaseLib.msa                         | 4 ++--
 MdePkg/Library/BaseLib/Ia32/ARShiftU64.c                   | 5 +----
 MdePkg/Library/BaseLib/Ia32/CpuBreakpoint.c                | 5 +----
 MdePkg/Library/BaseLib/Ia32/CpuFlushTlb.c                  | 5 +----
 MdePkg/Library/BaseLib/Ia32/CpuId.c                        | 5 +----
 MdePkg/Library/BaseLib/Ia32/CpuIdEx.c                      | 6 +-----
 MdePkg/Library/BaseLib/Ia32/CpuPause.c                     | 5 +----
 MdePkg/Library/BaseLib/Ia32/CpuSleep.c                     | 5 +----
 MdePkg/Library/BaseLib/Ia32/DisableInterrupts.c            | 5 +----
 MdePkg/Library/BaseLib/Ia32/DisablePaging32.c              | 5 +----
 MdePkg/Library/BaseLib/Ia32/DivU64x32.c                    | 5 +----
 MdePkg/Library/BaseLib/Ia32/DivU64x32Remainder.c           | 5 +----
 MdePkg/Library/BaseLib/Ia32/DivU64x64Remainder.c           | 5 +----
 MdePkg/Library/BaseLib/Ia32/EnableDisableInterrupts.c      | 5 +----
 MdePkg/Library/BaseLib/Ia32/EnableInterrupts.c             | 5 +----
 MdePkg/Library/BaseLib/Ia32/EnablePaging32.c               | 5 +----
 MdePkg/Library/BaseLib/Ia32/FlushCacheLine.c               | 5 +----
 MdePkg/Library/BaseLib/Ia32/FxRestore.c                    | 5 +----
 MdePkg/Library/BaseLib/Ia32/FxSave.c                       | 5 +----
 MdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange32.c | 5 +----
 MdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange64.c | 6 +-----
 MdePkg/Library/BaseLib/Ia32/InterlockedDecrement.c         | 6 +-----
 MdePkg/Library/BaseLib/Ia32/InterlockedIncrement.c         | 5 +----
 MdePkg/Library/BaseLib/Ia32/Invd.c                         | 5 +----
 MdePkg/Library/BaseLib/Ia32/LRotU64.c                      | 5 +----
 MdePkg/Library/BaseLib/Ia32/LShiftU64.c                    | 5 +----
 MdePkg/Library/BaseLib/Ia32/LongJump.c                     | 5 +----
 MdePkg/Library/BaseLib/Ia32/ModU64x32.c                    | 6 +-----
 MdePkg/Library/BaseLib/Ia32/Monitor.c                      | 5 +----
 MdePkg/Library/BaseLib/Ia32/MultU64x32.c                   | 5 +----
 MdePkg/Library/BaseLib/Ia32/MultU64x64.c                   | 5 +----
 MdePkg/Library/BaseLib/Ia32/Mwait.c                        | 5 +----
 MdePkg/Library/BaseLib/Ia32/RRotU64.c                      | 5 +----
 MdePkg/Library/BaseLib/Ia32/RShiftU64.c                    | 5 +----
 MdePkg/Library/BaseLib/Ia32/ReadCr0.c                      | 6 +-----
 MdePkg/Library/BaseLib/Ia32/ReadCr2.c                      | 5 +----
 MdePkg/Library/BaseLib/Ia32/ReadCr3.c                      | 5 +----
 MdePkg/Library/BaseLib/Ia32/ReadCr4.c                      | 5 +----
 MdePkg/Library/BaseLib/Ia32/ReadCs.c                       | 5 +----
 MdePkg/Library/BaseLib/Ia32/ReadDr0.c                      | 5 +----
 MdePkg/Library/BaseLib/Ia32/ReadDr1.c                      | 5 +----
 MdePkg/Library/BaseLib/Ia32/ReadDr2.c                      | 5 +----
 MdePkg/Library/BaseLib/Ia32/ReadDr3.c                      | 5 +----
 MdePkg/Library/BaseLib/Ia32/ReadDr4.c                      | 5 +----
 MdePkg/Library/BaseLib/Ia32/ReadDr5.c                      | 5 +----
 MdePkg/Library/BaseLib/Ia32/ReadDr6.c                      | 5 +----
 MdePkg/Library/BaseLib/Ia32/ReadDr7.c                      | 5 +----
 MdePkg/Library/BaseLib/Ia32/ReadDs.c                       | 5 +----
 MdePkg/Library/BaseLib/Ia32/ReadEflags.c                   | 5 +----
 MdePkg/Library/BaseLib/Ia32/ReadEs.c                       | 5 +----
 MdePkg/Library/BaseLib/Ia32/ReadFs.c                       | 5 +----
 MdePkg/Library/BaseLib/Ia32/ReadGdtr.c                     | 5 +----
 MdePkg/Library/BaseLib/Ia32/ReadGs.c                       | 5 +----
 MdePkg/Library/BaseLib/Ia32/ReadIdtr.c                     | 6 +-----
 MdePkg/Library/BaseLib/Ia32/ReadLdtr.c                     | 5 +----
 MdePkg/Library/BaseLib/Ia32/ReadMm0.c                      | 5 +----
 MdePkg/Library/BaseLib/Ia32/ReadMm1.c                      | 5 +----
 MdePkg/Library/BaseLib/Ia32/ReadMm2.c                      | 5 +----
 MdePkg/Library/BaseLib/Ia32/ReadMm3.c                      | 5 +----
 MdePkg/Library/BaseLib/Ia32/ReadMm4.c                      | 5 +----
 MdePkg/Library/BaseLib/Ia32/ReadMm5.c                      | 5 +----
 MdePkg/Library/BaseLib/Ia32/ReadMm6.c                      | 5 +----
 MdePkg/Library/BaseLib/Ia32/ReadMm7.c                      | 5 +----
 MdePkg/Library/BaseLib/Ia32/ReadMsr64.c                    | 5 +----
 MdePkg/Library/BaseLib/Ia32/ReadPmc.c                      | 5 +----
 MdePkg/Library/BaseLib/Ia32/ReadSs.c                       | 5 +----
 MdePkg/Library/BaseLib/Ia32/ReadTr.c                       | 5 +----
 MdePkg/Library/BaseLib/Ia32/ReadTsc.c                      | 5 +----
 MdePkg/Library/BaseLib/Ia32/SetJump.c                      | 7 ++-----
 MdePkg/Library/BaseLib/Ia32/SwapBytes64.c                  | 5 +----
 MdePkg/Library/BaseLib/Ia32/Wbinvd.c                       | 5 +----
 MdePkg/Library/BaseLib/Ia32/WriteCr0.c                     | 5 +----
 MdePkg/Library/BaseLib/Ia32/WriteCr2.c                     | 5 +----
 MdePkg/Library/BaseLib/Ia32/WriteCr3.c                     | 5 +----
 MdePkg/Library/BaseLib/Ia32/WriteCr4.c                     | 5 +----
 MdePkg/Library/BaseLib/Ia32/WriteDr0.c                     | 5 +----
 MdePkg/Library/BaseLib/Ia32/WriteDr1.c                     | 5 +----
 MdePkg/Library/BaseLib/Ia32/WriteDr2.c                     | 5 +----
 MdePkg/Library/BaseLib/Ia32/WriteDr3.c                     | 5 +----
 MdePkg/Library/BaseLib/Ia32/WriteDr4.c                     | 5 +----
 MdePkg/Library/BaseLib/Ia32/WriteDr5.c                     | 5 +----
 MdePkg/Library/BaseLib/Ia32/WriteDr6.c                     | 5 +----
 MdePkg/Library/BaseLib/Ia32/WriteDr7.c                     | 5 +----
 MdePkg/Library/BaseLib/Ia32/WriteGdtr.c                    | 5 +----
 MdePkg/Library/BaseLib/Ia32/WriteIdtr.c                    | 5 +----
 MdePkg/Library/BaseLib/Ia32/WriteLdtr.c                    | 5 +----
 MdePkg/Library/BaseLib/Ia32/WriteMm0.c                     | 5 +----
 MdePkg/Library/BaseLib/Ia32/WriteMm1.c                     | 5 +----
 MdePkg/Library/BaseLib/Ia32/WriteMm2.c                     | 5 +----
 MdePkg/Library/BaseLib/Ia32/WriteMm3.c                     | 5 +----
 MdePkg/Library/BaseLib/Ia32/WriteMm4.c                     | 6 +-----
 MdePkg/Library/BaseLib/Ia32/WriteMm5.c                     | 6 +-----
 MdePkg/Library/BaseLib/Ia32/WriteMm6.c                     | 5 +----
 MdePkg/Library/BaseLib/Ia32/WriteMm7.c                     | 5 +----
 MdePkg/Library/BaseLib/Ia32/WriteMsr64.c                   | 5 +----
 MdePkg/Library/BaseLib/SetJump.c                           | 7 +++----
 MdePkg/Library/BaseLib/X64/CpuBreakpoint.c                 | 4 +---
 MdePkg/Library/BaseLib/X64/InterlockedCompareExchange32.c  | 6 +-----
 MdePkg/Library/BaseLib/X64/InterlockedCompareExchange64.c  | 5 +----
 MdePkg/Library/BaseLib/X64/InterlockedDecrement.c          | 5 +----
 MdePkg/Library/BaseLib/X64/InterlockedIncrement.c          | 5 +----
 MdePkg/Library/BaseLib/X64/ReadMsr64.c                     | 5 +----
 MdePkg/Library/BaseLib/X64/WriteMsr64.c                    | 5 +----
 106 files changed, 113 insertions(+), 431 deletions(-)

(limited to 'MdePkg')

diff --git a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.msa b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.msa
index 74d4332..e974647 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 69fb878..806f44b 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 d05a7fc..2c68a3e 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 fa8e8ed..185810f 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 3c4a5b3..01e0bdf 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 e13f13f..fc5b637 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 6845117..2eea64d 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 189e9e6..64b215a 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 6ebbcbc..8e475d8 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 e520698..0a4c101 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 f813ff9..fa00381 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 99d9e29..5d69409 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 2e7f928..58597ce 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 dd73215..7ec3c2d 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 b7e354b..8f74930 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 2a89314..14b2f27 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 d6b0370..fe6ebf7 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 bead074..2770e63 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 146089c..7aecd01 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 6da213a..4b3c7f7 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 e51b882..155a159 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 8a34023..9a013e1 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 2440896..07be35e 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 5bddf71..d3747be 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 f0d5fb2..c3854e9 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 0854ace..4fa35c6 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 113bdd6..2fdfd28 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 e45d2de..7761b95 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 64f9e37..193a412 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 3444773..0e58625 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 2433bcc..f935632 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 ec29a0d..e1f52b9 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 a2444e9..ea0643d 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 71757bd..a014b44 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 b6ad777..0256f2c 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 78ac484..f91fc37 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 a57539d..cc878e8 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 4931775..ce43048 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 09a4230..2a61e1b 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 02462ef..c151acc 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 bc5dd72..c88dd31 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 5634e49..f93e16c 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 cc91973..b3ff929 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 10e8a48..6d9f899 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 bbacec4..638bf8f 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 c4390d0..82a3f86 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 fab9f67..d68de88 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 6b0db98..175e6f6 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 8a84658..28a9182 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 02794f8..b0ac10f 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 c757928..13990b5 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 49901b0..c927d66 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 dcd04ee..2fa183b 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 73f6d0e..d142e4d 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 f98e9f8..86bb10d 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 47da6e7..3cebfd6 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 d39f72f..e5885cc 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 df3f983..0950f8b 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 16ecd24..d42f95e 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 7026e18..e4d0e08 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 33188eb..c2e4920 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 2690e00..680db3b 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 6e8f9d0..b51619c 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 ed3d37c..a502e38 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 9aa892e..a97aae6 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 93ddfdb..4ae5d63 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 3b4d0ca..fb75548 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 bf5f5d8..a8b647d 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 9fd5d96..62ad424 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 7f7f1d5..5068c7f 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 54cbd90..2fa89f9 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 9854334..4f4dbca 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 acd0b82..1dd6adb 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 25e794d..ae75766 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 a120250..909b202 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 45f1faa..85921e0 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 e4606a7..0714d8e 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 772a463..e0f4bf0 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 e511a6e..f980980 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 74f4877..4f29303 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 4ecbcb1..190fb22 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 f8a4b45..ad2d1ad 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 546f92c..2786248 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 e2f72e3..c6e118e 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 1b50f4d..bc7d804 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 3f5f420..a3bd33c 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 b264651..0f937e6 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 4fd530f..d43b204 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 93b5142..c320b96 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 c4abb9c..d6e66d4 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 f64b338..abdda7f 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 238a7c4..d0ff1eb 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 5cc01b6..5851fb5 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 0ad39dc..50017a9 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 0904dc8..df8d457 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 8003f7f..9058565 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 8085d03..7d9a3a6 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 778fb9f..7e2fda0 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 cb77d09..d6c2723 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 e13f13f..01939e9 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 c8857db..4a9fe6a 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 8cd90b3..bed1dc8 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 bc171a7..19e6a5d 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 b5651bc..eda9f79 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 b1fdff9..15a573f 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 8e5d90f..1d1e0bc 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
-- 
cgit v1.1