Fix compilation errors detected with GCC 4.4

[mirror_edk2.git] / StdLib / EfiSocketLib / Socket.h

diff --git a/StdLib/EfiSocketLib/Socket.h b/StdLib/EfiSocketLib/Socket.h
index 25133e6f89776815d51de8ac3c7bc87b0841db49..50bb2d3efdbb467d075509c5c7eec945bdc6b368 100644 (file)
--- a/StdLib/EfiSocketLib/Socket.h
+++ b/StdLib/EfiSocketLib/Socket.h
@@ -220,7 +220,7 @@ typedef struct _ESL_IO_MGMT {
     EFI_UDP4_COMPLETION_TOKEN Udp4Rx; ///<  UDP4 receive token\r
     EFI_UDP4_COMPLETION_TOKEN Udp4Tx; ///<  UDP4 transmit token\r
   } Token;                            ///<  Completion token for the network operation\r
-};\r
+} GCC_IO_MGMT;\r
 \r
 /**\r
   IP4 context structure\r
@@ -480,6 +480,26 @@ EFI_STATUS
   IN BOOLEAN bBindTest\r
   );\r
 \r
+/**\r
+  Process the completion event\r
+\r
+  This routine handles the I/O completion event.\r
+\r
+  This routine is called by the low level network driver when\r
+  the operation is completed.\r
+\r
+  @param [in] Event     The receive completion event\r
+\r
+  @param [in] pIo       The address of an ::ESL_IO_MGMT structure\r
+\r
+**/\r
+typedef\r
+VOID\r
+(* PFN_API_IO_COMPLETE) (\r
+  IN EFI_EVENT Event,\r
+  IN ESL_IO_MGMT * pIo\r
+  );\r
+\r
 /**\r
   Determine if the socket is configured.\r
 \r
@@ -726,26 +746,6 @@ EFI_STATUS
   IN socklen_t SockAddrLength\r
   );\r
 \r
-/**\r
-  Process the receive completion\r
-\r
-  This routine handles the receive completion event.\r
-\r
-  This routine is called by the low level network driver when\r
-  data is received.\r
-\r
-  @param [in] Event     The receive completion event\r
-\r
-  @param [in] pIo       The address of an ::ESL_IO_MGMT structure\r
-\r
-**/\r
-typedef\r
-VOID\r
-(* PFN_API_RX_COMPLETE) (\r
-  IN EFI_EVENT Event,\r
-  IN ESL_IO_MGMT * pIo\r
-  );\r
-\r
 /**\r
   Start a receive operation\r
 \r
@@ -853,7 +853,7 @@ typedef struct {
   PFN_API_RECEIVE pfnReceive;               ///<  Attempt to receive some data\r
   PFN_API_REMOTE_ADDR_GET pfnRemoteAddrGet; ///<  Get remote address\r
   PFN_API_REMOTE_ADDR_SET pfnRemoteAddrSet; ///<  Set the remote system address\r
-  PFN_API_RX_COMPLETE pfnRxComplete;        ///<  RX completion\r
+  PFN_API_IO_COMPLETE pfnRxComplete;        ///<  RX completion\r
   PFN_API_RX_START pfnRxStart;              ///<  Start a network specific receive operation\r
   PFN_API_TRANSMIT pfnTransmit;             ///<  Attempt to buffer a packet for transmit\r
   PFN_API_TX_COMPLETE pfnTxComplete;        ///<  TX completion for normal data\r
@@ -1132,7 +1132,7 @@ EslSocketIoInit (
   IN ESL_IO_MGMT ** ppFreeQueue,\r
   IN UINTN DebugFlags,\r
   IN CHAR8 * pEventName,\r
-  IN EFI_EVENT_NOTIFY pfnCompletion\r
+  IN PFN_API_IO_COMPLETE pfnCompletion\r
   );\r
 \r
 /**\r