From 1f7eb561d906e47d6dec2fb1406c1a8694f2bd38 Mon Sep 17 00:00:00 2001
From: sfu5 <sfu5@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Mon, 17 Dec 2012 06:48:35 +0000
Subject: Fix GCC build fail issue for MdeModulePkg and NetworkPkg.

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

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@14007 6f19259b-4bc3-4df7-8a09-765794883524
---
 MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.c       | 3 ++-
 MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.c   | 3 ++-
 MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c       | 3 ++-
 MdeModulePkg/Universal/Network/MnpDxe/MnpConfig.c       | 3 ++-
 MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.c       | 6 ++++--
 MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c | 3 ++-
 MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.h   | 2 +-
 MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.c     | 3 ++-
 MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.c     | 3 ++-
 9 files changed, 19 insertions(+), 10 deletions(-)

(limited to 'MdeModulePkg/Universal')

diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.c b/MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.c
index 8914ebf..81ddd62 100644
--- a/MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.c
+++ b/MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.c
@@ -252,10 +252,11 @@ ArpCleanService (
 
 **/
 EFI_STATUS
+EFIAPI
 ArpDestroyChildEntryInHandleBuffer (
   IN LIST_ENTRY         *Entry,
   IN VOID               *Context
-)
+  )
 {
   ARP_INSTANCE_DATA             *Instance;
   EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;
diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.c b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.c
index 20758d3..d1bba30 100644
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.c
+++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.c
@@ -364,10 +364,11 @@ ON_ERROR:
 
 **/
 EFI_STATUS
+EFIAPI
 Dhcp4DestroyChildEntry (
   IN LIST_ENTRY         *Entry,
   IN VOID               *Context
-)
+  )
 {
   DHCP_PROTOCOL                    *Instance;
   EFI_SERVICE_BINDING_PROTOCOL     *ServiceBinding;
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c
index 5a84837..4a3d342 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c
@@ -406,10 +406,11 @@ Ip4CleanService (
 
 **/
 EFI_STATUS
+EFIAPI
 Ip4DestroyChildEntryInHandleBuffer (
   IN LIST_ENTRY         *Entry,
   IN VOID               *Context
-)
+  )
 {
   IP4_PROTOCOL                  *IpInstance;
   EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;
diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpConfig.c b/MdeModulePkg/Universal/Network/MnpDxe/MnpConfig.c
index 9586db7..046d4df 100644
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpConfig.c
+++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpConfig.c
@@ -696,10 +696,11 @@ MnpDestroyServiceData (
 
 **/
 EFI_STATUS
+EFIAPI
 MnpDestoryChildEntry (
   IN LIST_ENTRY         *Entry,
   IN VOID               *Context
-)
+  )
 {
   MNP_INSTANCE_DATA             *Instance;
   EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;
diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.c b/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.c
index 84c618c..2ddcec8 100644
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.c
+++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.c
@@ -37,10 +37,11 @@ EFI_DRIVER_BINDING_PROTOCOL gMnpDriverBinding = {
 
 **/
 EFI_STATUS
+EFIAPI
 MnpDestroyServiceDataEntry (
   IN LIST_ENTRY         *Entry,
   IN VOID               *Context
-)
+  )
 {
   MNP_SERVICE_DATA              *MnpServiceData;
   
@@ -59,10 +60,11 @@ MnpDestroyServiceDataEntry (
 
 **/
 EFI_STATUS
+EFIAPI
 MnpDestroyServiceChildEntry (
   IN LIST_ENTRY         *Entry,
   IN VOID               *Context
-)
+  )
 {
   MNP_SERVICE_DATA              *MnpServiceData;
 
diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c
index 8da47fc..a23d405 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c
@@ -328,10 +328,11 @@ ON_ERROR:
 
 **/
 EFI_STATUS
+EFIAPI
 Mtftp4DestroyChildEntryInHandleBuffer (
   IN LIST_ENTRY         *Entry,
   IN VOID               *Context
-)
+  )
 {
   MTFTP4_PROTOCOL               *Instance;
   EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;
diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.h b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.h
index 329c6d8..527fd1d 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.h
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.h
@@ -34,7 +34,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #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;
 
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.c
index 1021252..76eac72 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.c
@@ -147,10 +147,11 @@ Tcp4DestroyTimer (
 
 **/
 EFI_STATUS
+EFIAPI
 Tcp4DestroyChildEntryInHandleBuffer (
   IN LIST_ENTRY         *Entry,
   IN VOID               *Context
-)
+  )
 {
   SOCKET                        *Sock;
   EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;
diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.c b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.c
index 96b08d1..34e15da 100644
--- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.c
+++ b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.c
@@ -39,10 +39,11 @@ EFI_SERVICE_BINDING_PROTOCOL mUdp4ServiceBinding = {
 
 **/
 EFI_STATUS
+EFIAPI
 Udp4DestroyChildEntryInHandleBuffer (
   IN LIST_ENTRY         *Entry,
   IN VOID               *Context
-)
+  )
 {
   UDP4_INSTANCE_DATA            *Instance;
   EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;
-- 
cgit v1.1