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/Include/Library/NetLib.h

@@ -677,7 +677,7 @@ EFI_STATUS
 (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 @@ NetDestroyLinkList (
   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 @@ NetDestroyLinkList (
 
 **/
 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

MdeModulePkg/Library/DxeNetLib/DxeNetLib.c

@@ -1095,7 +1095,7 @@ NetDestroyLinkList (
   IN   NET_DESTROY_LINK_LIST_CALLBACK   CallBack,
   IN   VOID                             *Context,    OPTIONAL
   OUT  UINTN                            *ListLength  OPTIONAL
-)
+  )
 {
   UINTN                         PreviousLength;
   LIST_ENTRY                    *Entry;
@@ -1158,7 +1158,7 @@ NetIsInHandleBuffer (
   IN  EFI_HANDLE          Handle,
   IN  UINTN               NumberOfChildren,
   IN  EFI_HANDLE          *ChildHandleBuffer OPTIONAL
-)
+  )
 {
   UINTN     Index;
   

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;

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;

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;

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;

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;
 

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;

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;
 

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;

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;

NetworkPkg/Dhcp6Dxe/Dhcp6Driver.c

@@ -337,10 +337,11 @@ Dhcp6CreateInstance (
 
 **/
 EFI_STATUS
+EFIAPI
 Dhcp6DestroyChildEntry (
   IN LIST_ENTRY         *Entry,
   IN VOID               *Context
-)
+  )
 {
   DHCP6_INSTANCE                   *Instance;
   EFI_SERVICE_BINDING_PROTOCOL     *ServiceBinding;

NetworkPkg/Ip6Dxe/Ip6Common.c

@@ -339,10 +339,11 @@ Ip6AddAddr (
 
 **/
 EFI_STATUS
+EFIAPI
 Ip6DestroyChildEntryByAddr (
   IN LIST_ENTRY         *Entry,
   IN VOID               *Context
-)
+  )
 {
   IP6_PROTOCOL                  *Instance;
   EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;

NetworkPkg/Ip6Dxe/Ip6Driver.c

@@ -584,10 +584,11 @@ Ip6DriverBindingStart (
 
 **/
 EFI_STATUS
+EFIAPI
 Ip6DestroyChildEntryInHandleBuffer (
   IN LIST_ENTRY         *Entry,
   IN VOID               *Context
-)
+  )
 {
   IP6_PROTOCOL                  *IpInstance;
   EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;

NetworkPkg/Mtftp6Dxe/Mtftp6Driver.c

@@ -247,10 +247,11 @@ Mtftp6CreateInstance (
 
 **/
 EFI_STATUS
+EFIAPI
 Mtftp6DestroyChildEntryInHandleBuffer (
   IN LIST_ENTRY         *Entry,
   IN VOID               *Context
-)
+  )
 {
   MTFTP6_INSTANCE               *Instance;
   EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;

NetworkPkg/TcpDxe/TcpDriver.c

@@ -342,10 +342,11 @@ ON_ERROR:
 
 **/
 EFI_STATUS
+EFIAPI
 TcpDestroyChildEntryInHandleBuffer (
   IN LIST_ENTRY         *Entry,
   IN VOID               *Context
-)
+  )
 {
   SOCKET                        *Sock;
   EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;

NetworkPkg/Udp6Dxe/Udp6Driver.c

@@ -189,10 +189,11 @@ EXIT:
 
 **/
 EFI_STATUS
+EFIAPI
 Udp6DestroyChildEntryInHandleBuffer (
   IN LIST_ENTRY         *Entry,
   IN VOID               *Context
-)
+  )
 {
   UDP6_INSTANCE_DATA            *Instance;
   EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;