Revision: 14007
          http://edk2.svn.sourceforge.net/edk2/?rev=14007&view=rev
Author:   sfu5
Date:     2012-12-17 06:48:35 +0000 (Mon, 17 Dec 2012)
Log Message:
-----------
Fix GCC build fail issue for MdeModulePkg and NetworkPkg.

Signed-off-by: Fu Siyuan <siyuan...@intel.com>
Reviewed-by: Ye Ting <ting...@intel.com>
Reviewed-by: Ouyang Qian <qian.ouy...@intel.com>

Modified Paths:
--------------
    trunk/edk2/MdeModulePkg/Include/Library/NetLib.h
    trunk/edk2/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
    trunk/edk2/MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.c
    trunk/edk2/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.c
    trunk/edk2/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c
    trunk/edk2/MdeModulePkg/Universal/Network/MnpDxe/MnpConfig.c
    trunk/edk2/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.c
    trunk/edk2/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c
    trunk/edk2/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.h
    trunk/edk2/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.c
    trunk/edk2/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.c
    trunk/edk2/NetworkPkg/Dhcp6Dxe/Dhcp6Driver.c
    trunk/edk2/NetworkPkg/Ip6Dxe/Ip6Common.c
    trunk/edk2/NetworkPkg/Ip6Dxe/Ip6Driver.c
    trunk/edk2/NetworkPkg/Mtftp6Dxe/Mtftp6Driver.c
    trunk/edk2/NetworkPkg/TcpDxe/TcpDriver.c
    trunk/edk2/NetworkPkg/Udp6Dxe/Udp6Driver.c

Modified: trunk/edk2/MdeModulePkg/Include/Library/NetLib.h
===================================================================
--- trunk/edk2/MdeModulePkg/Include/Library/NetLib.h    2012-12-17 03:30:43 UTC 
(rev 14006)
+++ trunk/edk2/MdeModulePkg/Include/Library/NetLib.h    2012-12-17 06:48:35 UTC 
(rev 14007)
@@ -677,7 +677,7 @@
 (EFIAPI *NET_DESTROY_LINK_LIST_CALLBACK) (
   IN LIST_ENTRY         *Entry,
   IN VOID               *Context   OPTIONAL
-);
+  );
 
 /**
   Safe destroy nodes in a linked list, and return the length of the list after 
all possible operations finished.
@@ -708,7 +708,7 @@
   IN   NET_DESTROY_LINK_LIST_CALLBACK   CallBack,
   IN   VOID                             *Context,    OPTIONAL
   OUT  UINTN                            *ListLength  OPTIONAL
-);
+  );
 
 /**
   This function checks the input Handle to see if it's one of these handles in 
ChildHandleBuffer.
@@ -723,11 +723,12 @@
 
 **/
 BOOLEAN
+EFIAPI
 NetIsInHandleBuffer (
   IN  EFI_HANDLE          Handle,
   IN  UINTN               NumberOfChildren,
   IN  EFI_HANDLE          *ChildHandleBuffer OPTIONAL
-);
+  );
 
 //
 // Object container: EFI network stack spec defines various kinds of

Modified: trunk/edk2/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
===================================================================
--- trunk/edk2/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c       2012-12-17 
03:30:43 UTC (rev 14006)
+++ trunk/edk2/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c       2012-12-17 
06:48:35 UTC (rev 14007)
@@ -1095,7 +1095,7 @@
   IN   NET_DESTROY_LINK_LIST_CALLBACK   CallBack,
   IN   VOID                             *Context,    OPTIONAL
   OUT  UINTN                            *ListLength  OPTIONAL
-)
+  )
 {
   UINTN                         PreviousLength;
   LIST_ENTRY                    *Entry;
@@ -1158,7 +1158,7 @@
   IN  EFI_HANDLE          Handle,
   IN  UINTN               NumberOfChildren,
   IN  EFI_HANDLE          *ChildHandleBuffer OPTIONAL
-)
+  )
 {
   UINTN     Index;
   

Modified: trunk/edk2/MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.c
===================================================================
--- trunk/edk2/MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.c        
2012-12-17 03:30:43 UTC (rev 14006)
+++ trunk/edk2/MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.c        
2012-12-17 06:48:35 UTC (rev 14007)
@@ -252,10 +252,11 @@
 
 **/
 EFI_STATUS
+EFIAPI
 ArpDestroyChildEntryInHandleBuffer (
   IN LIST_ENTRY         *Entry,
   IN VOID               *Context
-)
+  )
 {
   ARP_INSTANCE_DATA             *Instance;
   EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;

Modified: trunk/edk2/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.c
===================================================================
--- trunk/edk2/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.c    
2012-12-17 03:30:43 UTC (rev 14006)
+++ trunk/edk2/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.c    
2012-12-17 06:48:35 UTC (rev 14007)
@@ -364,10 +364,11 @@
 
 **/
 EFI_STATUS
+EFIAPI
 Dhcp4DestroyChildEntry (
   IN LIST_ENTRY         *Entry,
   IN VOID               *Context
-)
+  )
 {
   DHCP_PROTOCOL                    *Instance;
   EFI_SERVICE_BINDING_PROTOCOL     *ServiceBinding;

Modified: trunk/edk2/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c
===================================================================
--- trunk/edk2/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c        
2012-12-17 03:30:43 UTC (rev 14006)
+++ trunk/edk2/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c        
2012-12-17 06:48:35 UTC (rev 14007)
@@ -406,10 +406,11 @@
 
 **/
 EFI_STATUS
+EFIAPI
 Ip4DestroyChildEntryInHandleBuffer (
   IN LIST_ENTRY         *Entry,
   IN VOID               *Context
-)
+  )
 {
   IP4_PROTOCOL                  *IpInstance;
   EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;

Modified: trunk/edk2/MdeModulePkg/Universal/Network/MnpDxe/MnpConfig.c
===================================================================
--- trunk/edk2/MdeModulePkg/Universal/Network/MnpDxe/MnpConfig.c        
2012-12-17 03:30:43 UTC (rev 14006)
+++ trunk/edk2/MdeModulePkg/Universal/Network/MnpDxe/MnpConfig.c        
2012-12-17 06:48:35 UTC (rev 14007)
@@ -696,10 +696,11 @@
 
 **/
 EFI_STATUS
+EFIAPI
 MnpDestoryChildEntry (
   IN LIST_ENTRY         *Entry,
   IN VOID               *Context
-)
+  )
 {
   MNP_INSTANCE_DATA             *Instance;
   EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;

Modified: trunk/edk2/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.c
===================================================================
--- trunk/edk2/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.c        
2012-12-17 03:30:43 UTC (rev 14006)
+++ trunk/edk2/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.c        
2012-12-17 06:48:35 UTC (rev 14007)
@@ -37,10 +37,11 @@
 
 **/
 EFI_STATUS
+EFIAPI
 MnpDestroyServiceDataEntry (
   IN LIST_ENTRY         *Entry,
   IN VOID               *Context
-)
+  )
 {
   MNP_SERVICE_DATA              *MnpServiceData;
   
@@ -59,10 +60,11 @@
 
 **/
 EFI_STATUS
+EFIAPI
 MnpDestroyServiceChildEntry (
   IN LIST_ENTRY         *Entry,
   IN VOID               *Context
-)
+  )
 {
   MNP_SERVICE_DATA              *MnpServiceData;
 

Modified: trunk/edk2/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c
===================================================================
--- trunk/edk2/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c  
2012-12-17 03:30:43 UTC (rev 14006)
+++ trunk/edk2/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c  
2012-12-17 06:48:35 UTC (rev 14007)
@@ -328,10 +328,11 @@
 
 **/
 EFI_STATUS
+EFIAPI
 Mtftp4DestroyChildEntryInHandleBuffer (
   IN LIST_ENTRY         *Entry,
   IN VOID               *Context
-)
+  )
 {
   MTFTP4_PROTOCOL               *Instance;
   EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;

Modified: trunk/edk2/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.h
===================================================================
--- trunk/edk2/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.h    
2012-12-17 03:30:43 UTC (rev 14006)
+++ trunk/edk2/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.h    
2012-12-17 06:48:35 UTC (rev 14007)
@@ -34,7 +34,7 @@
 #include <Library/MemoryAllocationLib.h>
 #include <Library/UefiBootServicesTableLib.h>
 #include <Library/UdpIoLib.h>
-#include <LIbrary/PrintLib.h>
+#include <Library/PrintLib.h>
 
 extern EFI_MTFTP4_PROTOCOL  gMtftp4ProtocolTemplate;
 

Modified: trunk/edk2/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.c
===================================================================
--- trunk/edk2/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.c      
2012-12-17 03:30:43 UTC (rev 14006)
+++ trunk/edk2/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.c      
2012-12-17 06:48:35 UTC (rev 14007)
@@ -147,10 +147,11 @@
 
 **/
 EFI_STATUS
+EFIAPI
 Tcp4DestroyChildEntryInHandleBuffer (
   IN LIST_ENTRY         *Entry,
   IN VOID               *Context
-)
+  )
 {
   SOCKET                        *Sock;
   EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;

Modified: trunk/edk2/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.c
===================================================================
--- trunk/edk2/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.c      
2012-12-17 03:30:43 UTC (rev 14006)
+++ trunk/edk2/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.c      
2012-12-17 06:48:35 UTC (rev 14007)
@@ -39,10 +39,11 @@
 
 **/
 EFI_STATUS
+EFIAPI
 Udp4DestroyChildEntryInHandleBuffer (
   IN LIST_ENTRY         *Entry,
   IN VOID               *Context
-)
+  )
 {
   UDP4_INSTANCE_DATA            *Instance;
   EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;

Modified: trunk/edk2/NetworkPkg/Dhcp6Dxe/Dhcp6Driver.c
===================================================================
--- trunk/edk2/NetworkPkg/Dhcp6Dxe/Dhcp6Driver.c        2012-12-17 03:30:43 UTC 
(rev 14006)
+++ trunk/edk2/NetworkPkg/Dhcp6Dxe/Dhcp6Driver.c        2012-12-17 06:48:35 UTC 
(rev 14007)
@@ -337,10 +337,11 @@
 
 **/
 EFI_STATUS
+EFIAPI
 Dhcp6DestroyChildEntry (
   IN LIST_ENTRY         *Entry,
   IN VOID               *Context
-)
+  )
 {
   DHCP6_INSTANCE                   *Instance;
   EFI_SERVICE_BINDING_PROTOCOL     *ServiceBinding;

Modified: trunk/edk2/NetworkPkg/Ip6Dxe/Ip6Common.c
===================================================================
--- trunk/edk2/NetworkPkg/Ip6Dxe/Ip6Common.c    2012-12-17 03:30:43 UTC (rev 
14006)
+++ trunk/edk2/NetworkPkg/Ip6Dxe/Ip6Common.c    2012-12-17 06:48:35 UTC (rev 
14007)
@@ -339,10 +339,11 @@
 
 **/
 EFI_STATUS
+EFIAPI
 Ip6DestroyChildEntryByAddr (
   IN LIST_ENTRY         *Entry,
   IN VOID               *Context
-)
+  )
 {
   IP6_PROTOCOL                  *Instance;
   EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;

Modified: trunk/edk2/NetworkPkg/Ip6Dxe/Ip6Driver.c
===================================================================
--- trunk/edk2/NetworkPkg/Ip6Dxe/Ip6Driver.c    2012-12-17 03:30:43 UTC (rev 
14006)
+++ trunk/edk2/NetworkPkg/Ip6Dxe/Ip6Driver.c    2012-12-17 06:48:35 UTC (rev 
14007)
@@ -584,10 +584,11 @@
 
 **/
 EFI_STATUS
+EFIAPI
 Ip6DestroyChildEntryInHandleBuffer (
   IN LIST_ENTRY         *Entry,
   IN VOID               *Context
-)
+  )
 {
   IP6_PROTOCOL                  *IpInstance;
   EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;

Modified: trunk/edk2/NetworkPkg/Mtftp6Dxe/Mtftp6Driver.c
===================================================================
--- trunk/edk2/NetworkPkg/Mtftp6Dxe/Mtftp6Driver.c      2012-12-17 03:30:43 UTC 
(rev 14006)
+++ trunk/edk2/NetworkPkg/Mtftp6Dxe/Mtftp6Driver.c      2012-12-17 06:48:35 UTC 
(rev 14007)
@@ -247,10 +247,11 @@
 
 **/
 EFI_STATUS
+EFIAPI
 Mtftp6DestroyChildEntryInHandleBuffer (
   IN LIST_ENTRY         *Entry,
   IN VOID               *Context
-)
+  )
 {
   MTFTP6_INSTANCE               *Instance;
   EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;

Modified: trunk/edk2/NetworkPkg/TcpDxe/TcpDriver.c
===================================================================
--- trunk/edk2/NetworkPkg/TcpDxe/TcpDriver.c    2012-12-17 03:30:43 UTC (rev 
14006)
+++ trunk/edk2/NetworkPkg/TcpDxe/TcpDriver.c    2012-12-17 06:48:35 UTC (rev 
14007)
@@ -342,10 +342,11 @@
 
 **/
 EFI_STATUS
+EFIAPI
 TcpDestroyChildEntryInHandleBuffer (
   IN LIST_ENTRY         *Entry,
   IN VOID               *Context
-)
+  )
 {
   SOCKET                        *Sock;
   EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;

Modified: trunk/edk2/NetworkPkg/Udp6Dxe/Udp6Driver.c
===================================================================
--- trunk/edk2/NetworkPkg/Udp6Dxe/Udp6Driver.c  2012-12-17 03:30:43 UTC (rev 
14006)
+++ trunk/edk2/NetworkPkg/Udp6Dxe/Udp6Driver.c  2012-12-17 06:48:35 UTC (rev 
14007)
@@ -189,10 +189,11 @@
 
 **/
 EFI_STATUS
+EFIAPI
 Udp6DestroyChildEntryInHandleBuffer (
   IN LIST_ENTRY         *Entry,
   IN VOID               *Context
-)
+  )
 {
   UDP6_INSTANCE_DATA            *Instance;
   EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
_______________________________________________
edk2-commits mailing list
edk2-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/edk2-commits

Reply via email to