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

1 files changed, 11 insertions, 36 deletions

diff --git a/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/support.c b/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/support.c
index 50c991372d..503d5a6038 100644
--- a/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/support.c
+++ b/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/support.c
@@ -1,17 +1,17 @@
 /*++

 

-Copyright (c) 2006, Intel Corporation                                                         

-All rights reserved. This program and the accompanying materials                          

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

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

-http://opensource.org/licenses/bsd-license.php                                            

-                                                                                          

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

+Copyright (c) 2006 - 2007, Intel Corporation

+All rights reserved. This program and the accompanying materials

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

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

+http://opensource.org/licenses/bsd-license.php

+

+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 

 Module Name:

   support.c

-  

+

 Abstract:

   Miscellaneous support routines for PxeDhcp4 protocol.

 

@@ -746,7 +746,7 @@ Parameters:
   op_flags := UDP receive operation flags

 

 Returns:

-  EFI_INVALID_PARAMETER := 

+  EFI_INVALID_PARAMETER :=

   EFI_SUCCESS := Packet received

   other := Return from PxeBc->UdpRead()

 --*/

@@ -827,7 +827,7 @@ Parameters:
   SecondsTimeout := Number of seconds until timeout

 

 Returns:

-  EFI_INVALID_PARAMETER := Private == NULL || ServerIp == NULL || 

+  EFI_INVALID_PARAMETER := Private == NULL || ServerIp == NULL ||

     tx_pkt == NULL || rx_pkt == NULL || rx_vfy == NULL || Private->PxeBc == NULL

   EFI_ABORTED := Receive aborted

   EFI_TIMEOUT := No packets received

@@ -923,31 +923,6 @@ Returns:
   //

   // Wait for packet(s)...

   //

-#if 0

-  if (!client_ip) {

-    Aprint ("client_ip == NULL    ");

-  } else {

-    Aprint (

-      "client_ip == %d.%d.%d.%d    ",

-      client_ip->v4.Addr[0],

-      client_ip->v4.Addr[1],

-      client_ip->v4.Addr[2],

-      client_ip->v4.Addr[3]

-      );

-  }

-

-  if (!ServerIp) {

-    Aprint ("ServerIp == NULL\n");

-  } else {

-    Aprint (

-      "ServerIp == %d.%d.%d.%d\n",

-      ServerIp->v4.Addr[0],

-      ServerIp->v4.Addr[1],

-      ServerIp->v4.Addr[2],

-      ServerIp->v4.Addr[3]

-      );

-  }

-#endif

 

   done_flag   = FALSE;

   got_packet  = FALSE;