From e798cd87ca9a3a30c4cea50c5f5de84e10a8bc5a Mon Sep 17 00:00:00 2001
From: geekboy15a <geekboy15a@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Fri, 16 Apr 2010 23:24:45 +0000
Subject: Fixed GCC 4.4 build issues due to EFIAPI not being used when
 required.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10379 6f19259b-4bc3-4df7-8a09-765794883524
---
 MdeModulePkg/Include/Library/IpIoLib.h  |  4 ++--
 MdeModulePkg/Include/Library/NetLib.h   | 17 +++++++++++++++--
 MdeModulePkg/Include/Library/UdpIoLib.h |  6 +++---
 3 files changed, 20 insertions(+), 7 deletions(-)

(limited to 'MdeModulePkg/Include')

diff --git a/MdeModulePkg/Include/Library/IpIoLib.h b/MdeModulePkg/Include/Library/IpIoLib.h
index b1cbacb593..537915b882 100644
--- a/MdeModulePkg/Include/Library/IpIoLib.h
+++ b/MdeModulePkg/Include/Library/IpIoLib.h
@@ -181,7 +181,7 @@ typedef struct _EFI_NET_SESSION_DATA {
 **/
 typedef
 VOID
-(*PKT_RCVD_NOTIFY) (
+(EFIAPI *PKT_RCVD_NOTIFY) (
   IN EFI_STATUS           Status, 
   IN UINT8                IcmpErr,
   IN EFI_NET_SESSION_DATA *NetSession,
@@ -201,7 +201,7 @@ VOID
 **/
 typedef
 VOID
-(*PKT_SENT_NOTIFY) (
+(EFIAPI *PKT_SENT_NOTIFY) (
   IN EFI_STATUS  Status,
   IN VOID        *Context,
   IN VOID        *Sender,
diff --git a/MdeModulePkg/Include/Library/NetLib.h b/MdeModulePkg/Include/Library/NetLib.h
index 71680a42b2..7f8cb15b0a 100644
--- a/MdeModulePkg/Include/Library/NetLib.h
+++ b/MdeModulePkg/Include/Library/NetLib.h
@@ -286,6 +286,7 @@ typedef struct {
 
 **/
 CHAR8 *
+EFIAPI
 NetDebugASPrint (
   IN CHAR8                  *Format,
   ...
@@ -309,6 +310,7 @@ NetDebugASPrint (
                                 than the mNetDebugLevelMax. Or, it has been sent out.
 **/
 EFI_STATUS
+EFIAPI
 NetDebugOutput (
   IN UINT32                    Level,
   IN UINT8                     *Module,
@@ -400,6 +402,7 @@ NetIp4IsUnicast (
 
 **/
 BOOLEAN
+EFIAPI
 NetIp6IsValidUnicast (
   IN EFI_IPv6_ADDRESS       *Ip6
   );
@@ -415,6 +418,7 @@ NetIp6IsValidUnicast (
 
 **/
 BOOLEAN
+EFIAPI
 NetIp6IsUnspecifiedAddr (
   IN EFI_IPv6_ADDRESS       *Ip6
   );
@@ -429,6 +433,7 @@ NetIp6IsUnspecifiedAddr (
 
 **/
 BOOLEAN
+EFIAPI
 NetIp6IsLinkLocalAddr (
   IN EFI_IPv6_ADDRESS *Ip6
   );
@@ -445,6 +450,7 @@ NetIp6IsLinkLocalAddr (
 
 **/
 BOOLEAN
+EFIAPI
 NetIp6IsNetEqual (
   EFI_IPv6_ADDRESS *Ip1,
   EFI_IPv6_ADDRESS *Ip2,
@@ -464,6 +470,7 @@ NetIp6IsNetEqual (
 
 **/
 EFI_IPv6_ADDRESS *
+EFIAPI
 Ip6Swap128 (
   EFI_IPv6_ADDRESS *Ip6
   );
@@ -888,7 +895,7 @@ NetMapRemoveTail (
 
 typedef
 EFI_STATUS
-(*NET_MAP_CALLBACK) (
+(EFIAPI *NET_MAP_CALLBACK) (
   IN NET_MAP                *Map,
   IN NET_MAP_ITEM           *Item,
   IN VOID                   *Arg
@@ -1241,6 +1248,7 @@ NetLibDefaultUnload (
 
 **/
 EFI_STATUS
+EFIAPI
 NetLibAsciiStrToIp4 (
   IN CONST CHAR8                 *String,
   OUT      EFI_IPv4_ADDRESS      *Ip4Address
@@ -1258,6 +1266,7 @@ NetLibAsciiStrToIp4 (
 
 **/
 EFI_STATUS
+EFIAPI
 NetLibAsciiStrToIp6 (
   IN CONST CHAR8                 *String,
   OUT      EFI_IPv6_ADDRESS      *Ip6Address
@@ -1275,6 +1284,7 @@ NetLibAsciiStrToIp6 (
 
 **/
 EFI_STATUS
+EFIAPI
 NetLibStrToIp4 (
   IN CONST CHAR16                *String,
   OUT      EFI_IPv4_ADDRESS      *Ip4Address
@@ -1293,6 +1303,7 @@ NetLibStrToIp4 (
 
 **/
 EFI_STATUS
+EFIAPI
 NetLibStrToIp6 (
   IN CONST CHAR16                *String,
   OUT      EFI_IPv6_ADDRESS      *Ip6Address
@@ -1313,6 +1324,7 @@ NetLibStrToIp6 (
 
 **/
 EFI_STATUS
+EFIAPI
 NetLibStrToIp6andPrefix (
   IN CONST CHAR16                *String,
   OUT      EFI_IPv6_ADDRESS      *Ip6Address,
@@ -1343,7 +1355,7 @@ typedef struct {
   UINT8               *Bulk;      // The block's Data
 } NET_BLOCK;
 
-typedef VOID (*NET_VECTOR_EXT_FREE) (VOID *Arg);
+typedef VOID (EFIAPI *NET_VECTOR_EXT_FREE) (VOID *Arg);
 
 //
 //NET_VECTOR contains several blocks to hold all packet's
@@ -1983,6 +1995,7 @@ NetPseudoHeadChecksum (
 
 **/
 UINT16
+EFIAPI
 NetIp6PseudoHeadChecksum (
   IN EFI_IPv6_ADDRESS       *Src,
   IN EFI_IPv6_ADDRESS       *Dst,
diff --git a/MdeModulePkg/Include/Library/UdpIoLib.h b/MdeModulePkg/Include/Library/UdpIoLib.h
index 03618f61bb..f0254177fe 100644
--- a/MdeModulePkg/Include/Library/UdpIoLib.h
+++ b/MdeModulePkg/Include/Library/UdpIoLib.h
@@ -60,7 +60,7 @@ typedef struct {
 **/
 typedef
 VOID
-(*UDP_IO_CALLBACK) (
+(EFIAPI *UDP_IO_CALLBACK) (
   IN NET_BUF                *Packet,
   IN UDP_END_POINT          *EndPoint,
   IN EFI_STATUS             IoStatus,
@@ -173,7 +173,7 @@ struct _UDP_IO {
 **/
 typedef
 EFI_STATUS
-(*UDP_IO_CONFIG) (
+(EFIAPI *UDP_IO_CONFIG) (
   IN UDP_IO                 *UdpIo,
   IN VOID                   *Context
   );
@@ -190,7 +190,7 @@ EFI_STATUS
 **/
 typedef
 BOOLEAN
-(*UDP_IO_TO_CANCEL) (
+(EFIAPI *UDP_IO_TO_CANCEL) (
   IN UDP_TX_TOKEN           *Token,
   IN VOID                   *Context
   );
-- 
cgit v1.2.3