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

7 files changed, 7 insertions, 28 deletions

diff --git a/MdePkg/Library/BaseLib/X64/CpuBreakpoint.c b/MdePkg/Library/BaseLib/X64/CpuBreakpoint.c
index e13f13f78b..01939e9128 100644
--- a/MdePkg/Library/BaseLib/X64/CpuBreakpoint.c
+++ b/MdePkg/Library/BaseLib/X64/CpuBreakpoint.c
@@ -1,7 +1,7 @@
 /** @file

   CpuBreakpoint function.

 

-  Copyright (c) 2006, Intel Corporation<BR>

+  Copyright (c) 2006 - 2007, Intel Corporation<BR>

   All rights reserved. This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -12,7 +12,6 @@
 

 **/

 

-#if _MSC_EXTENSIONS

 

 //

 // Microsoft Visual Studio 7.1 Function Prototypes for I/O Intrinsics

@@ -30,4 +29,3 @@ CpuBreakpoint (
   __debugbreak ();

 }

 

-#endif

diff --git a/MdePkg/Library/BaseLib/X64/InterlockedCompareExchange32.c b/MdePkg/Library/BaseLib/X64/InterlockedCompareExchange32.c
index c8857dbca5..4a9fe6aca6 100644
--- a/MdePkg/Library/BaseLib/X64/InterlockedCompareExchange32.c
+++ b/MdePkg/Library/BaseLib/X64/InterlockedCompareExchange32.c
@@ -1,7 +1,7 @@
 /** @file

   InterlockedCompareExchange32 function

 

-  Copyright (c) 2006, Intel Corporation<BR>

+  Copyright (c) 2006 - 2007, Intel Corporation<BR>

   All rights reserved. This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -12,8 +12,6 @@
 

 **/

 

-#if _MSC_EXTENSIONS

-

 //

 // Microsoft Visual Studio 7.1 Function Prototypes for I/O Intrinsics

 //

@@ -36,5 +34,3 @@ InternalSyncCompareExchange32 (
   return _InterlockedCompareExchange (Value, ExchangeValue, CompareValue);

 }

 

-

-#endif

diff --git a/MdePkg/Library/BaseLib/X64/InterlockedCompareExchange64.c b/MdePkg/Library/BaseLib/X64/InterlockedCompareExchange64.c
index 8cd90b393b..bed1dc8972 100644
--- a/MdePkg/Library/BaseLib/X64/InterlockedCompareExchange64.c
+++ b/MdePkg/Library/BaseLib/X64/InterlockedCompareExchange64.c
@@ -1,7 +1,7 @@
 /** @file

   InterlockedCompareExchange64 function

 

-  Copyright (c) 2006, Intel Corporation<BR>

+  Copyright (c) 2006 - 2007, Intel Corporation<BR>

   All rights reserved. This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -12,8 +12,6 @@
 

 **/

 

-#if _MSC_EXTENSIONS

-

 //

 // Microsoft Visual Studio 7.1 Function Prototypes for I/O Intrinsics

 //

@@ -36,4 +34,3 @@ InternalSyncCompareExchange64 (
   return _InterlockedCompareExchange64 (Value, ExchangeValue, CompareValue);

 }

 

-#endif

diff --git a/MdePkg/Library/BaseLib/X64/InterlockedDecrement.c b/MdePkg/Library/BaseLib/X64/InterlockedDecrement.c
index bc171a79cc..19e6a5dc49 100644
--- a/MdePkg/Library/BaseLib/X64/InterlockedDecrement.c
+++ b/MdePkg/Library/BaseLib/X64/InterlockedDecrement.c
@@ -1,7 +1,7 @@
 /** @file

   InterlockedDecrement function

 

-  Copyright (c) 2006, Intel Corporation<BR>

+  Copyright (c) 2006 - 2007, Intel Corporation<BR>

   All rights reserved. This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -12,8 +12,6 @@
 

 **/

 

-#if _MSC_EXTENSIONS

-

 //

 // Microsoft Visual Studio 7.1 Function Prototypes for I/O Intrinsics

 //

@@ -32,4 +30,3 @@ InternalSyncDecrement (
   return _InterlockedDecrement (Value);

 }

 

-#endif

diff --git a/MdePkg/Library/BaseLib/X64/InterlockedIncrement.c b/MdePkg/Library/BaseLib/X64/InterlockedIncrement.c
index b5651bc003..eda9f79a5b 100644
--- a/MdePkg/Library/BaseLib/X64/InterlockedIncrement.c
+++ b/MdePkg/Library/BaseLib/X64/InterlockedIncrement.c
@@ -1,7 +1,7 @@
 /** @file

   InterLockedIncrement function

 

-  Copyright (c) 2006, Intel Corporation<BR>

+  Copyright (c) 2006 - 2007, Intel Corporation<BR>

   All rights reserved. This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -12,8 +12,6 @@
 

 **/

 

-#if _MSC_EXTENSIONS

-

 //

 // Microsoft Visual Studio 7.1 Function Prototypes for I/O Intrinsics

 //

@@ -32,4 +30,3 @@ InternalSyncIncrement (
   return _InterlockedIncrement (Value);

 }

 

-#endif

diff --git a/MdePkg/Library/BaseLib/X64/ReadMsr64.c b/MdePkg/Library/BaseLib/X64/ReadMsr64.c
index b1fdff97c0..15a573fc09 100644
--- a/MdePkg/Library/BaseLib/X64/ReadMsr64.c
+++ b/MdePkg/Library/BaseLib/X64/ReadMsr64.c
@@ -1,7 +1,7 @@
 /** @file

   CpuBreakpoint function.

 

-  Copyright (c) 2006, Intel Corporation<BR>

+  Copyright (c) 2006 - 2007, Intel Corporation<BR>

   All rights reserved. This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -12,8 +12,6 @@
 

 **/

 

-#if _MSC_EXTENSIONS

-

 //

 // Microsoft Visual Studio 7.1 Function Prototypes for I/O Intrinsics

 //

@@ -31,4 +29,3 @@ AsmReadMsr64 (
   return __readmsr (Index);

 }

 

-#endif

diff --git a/MdePkg/Library/BaseLib/X64/WriteMsr64.c b/MdePkg/Library/BaseLib/X64/WriteMsr64.c
index 8e5d90fec4..1d1e0bc332 100644
--- a/MdePkg/Library/BaseLib/X64/WriteMsr64.c
+++ b/MdePkg/Library/BaseLib/X64/WriteMsr64.c
@@ -1,7 +1,7 @@
 /** @file

   CpuBreakpoint function.

 

-  Copyright (c) 2006, Intel Corporation<BR>

+  Copyright (c) 2006 - 2007, Intel Corporation<BR>

   All rights reserved. This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -12,8 +12,6 @@
 

 **/

 

-#if _MSC_EXTENSIONS

-

 //

 // Microsoft Visual Studio 7.1 Function Prototypes for I/O Intrinsics

 //

@@ -32,4 +30,3 @@ AsmWriteMsr64 (
   return Value;

 }

 

-#endif