Using global namespace trick for socket API's (instead of renaming)

Author: sandeepmistry

src/socket/include/socket.h

@@ -1205,12 +1205,7 @@ NMI_API SOCKET socket(uint16 u16Domain, uint8 u8Type, uint8 u8Flags);
 	}
 @endcode	
 */
-#ifdef ARDUINO
-NMI_API sint8 bindSocket(SOCKET sock, struct sockaddr *pstrAddr, uint8 u8AddrLen);
-#else
 NMI_API sint8 bind(SOCKET sock, struct sockaddr *pstrAddr, uint8 u8AddrLen);
-#endif
-
 /** @} */
 
 /** @defgroup ListenFn listen
@@ -1332,11 +1327,7 @@ This example demonstrates the call of the listen socket operation after a succes
 
 @endcode
 */
-#ifdef ARDUINO
-NMI_API sint8 listenSocket(SOCKET sock, uint8 backlog);
-#else
 NMI_API sint8 listen(SOCKET sock, uint8 backlog);
-#endif
 /** @} */
 /** @defgroup AcceptFn accept
  *    @ingroup SocketAPI
@@ -1470,11 +1461,7 @@ NMI_API sint8 accept(SOCKET sock, struct sockaddr *addr, uint8 *addrlen);
 	}
 @endcode
 */
-#ifdef ARDUINO
-NMI_API sint8 connectSocket(SOCKET sock, struct sockaddr *pstrAddr, uint8 u8AddrLen);
-#else
 NMI_API sint8 connect(SOCKET sock, struct sockaddr *pstrAddr, uint8 u8AddrLen);
-#endif
 /** @} */
 /** @defgroup ReceiveFn recv
  *    @ingroup SocketAPI
@@ -1820,11 +1807,7 @@ NMI_API sint16 send(SOCKET sock, void *pvSendBuffer, uint16 u16SendLength, uint1
 @return
 	The function  returns @ref SOCK_ERR_NO_ERROR for successful operation and a negative value (indicating the error) otherwise. 
 */
-#ifdef ARDUINO
-NMI_API sint16 sendtoSocket(SOCKET sock, void *pvSendBuffer, uint16 u16SendLength, uint16 flags, struct sockaddr *pstrDestAddr, uint8 u8AddrLen);
-#else
 NMI_API sint16 sendto(SOCKET sock, void *pvSendBuffer, uint16 u16SendLength, uint16 flags, struct sockaddr *pstrDestAddr, uint8 u8AddrLen);
-#endif
 /** @} */
 /** @defgroup CloseSocketFn close
  *  @ingroup SocketAPI
@@ -1853,12 +1836,7 @@ NMI_API sint16 sendto(SOCKET sock, void *pvSendBuffer, uint16 u16SendLength, uin
 @return		
 	The function returned @ref SOCK_ERR_NO_ERROR for successful operation and a negative value (indicating the error) otherwise. 
 */
-#ifdef ARDUINO
-NMI_API sint8 closeSocket(SOCKET sock);
-#else
 NMI_API sint8 close(SOCKET sock);
-#endif
-
 /** @} */
 /** @defgroup InetAddressFn nmi_inet_addr
 *  @ingroup SocketAPI

src/socket/source/socket.c

@@ -623,11 +623,7 @@ Version
 Date
 		5 June 2012
 *********************************************************************/
-#ifdef ARDUINO
-sint8 bindSocket(SOCKET sock, struct sockaddr *pstrAddr, uint8 u8AddrLen)
-#else
 sint8 bind(SOCKET sock, struct sockaddr *pstrAddr, uint8 u8AddrLen)
-#endif
 {
 	sint8	s8Ret = SOCK_ERR_INVALID_ARG;
 	if((pstrAddr != NULL) && (sock >= 0) && (gastrSockets[sock].bIsUsed == 1) && (u8AddrLen != 0))
@@ -672,11 +668,7 @@ Version
 Date
 		5 June 2012
 *********************************************************************/
-#ifdef ARDUINO
-sint8 listenSocket(SOCKET sock, uint8 backlog)
-#else
 sint8 listen(SOCKET sock, uint8 backlog)
-#endif
 {
 	sint8	s8Ret = SOCK_ERR_INVALID_ARG;
 
@@ -748,11 +740,7 @@ Version
 Date
 		5 June 2012
 *********************************************************************/
-#ifdef ARDUINO
-sint8 connectSocket(SOCKET sock, struct sockaddr *pstrAddr, uint8 u8AddrLen)
-#else
 sint8 connect(SOCKET sock, struct sockaddr *pstrAddr, uint8 u8AddrLen)
-#endif
 {
 	sint8	s8Ret = SOCK_ERR_INVALID_ARG;
 	if((sock >= 0) && (pstrAddr != NULL) && (gastrSockets[sock].bIsUsed == 1) && (u8AddrLen != 0))
@@ -856,11 +844,7 @@ Version
 Date
 		4 June 2012
 *********************************************************************/
-#ifdef ARDUINO
-sint16 sendtoSocket(SOCKET sock, void *pvSendBuffer, uint16 u16SendLength, uint16 flags, struct sockaddr *pstrDestAddr, uint8 u8AddrLen)
-#else
 sint16 sendto(SOCKET sock, void *pvSendBuffer, uint16 u16SendLength, uint16 flags, struct sockaddr *pstrDestAddr, uint8 u8AddrLen)
-#endif
 {
 #ifdef ARDUINO
 	// Silence "unused" warning
@@ -979,11 +963,7 @@ Version
 Date
 		4 June 2012
 *********************************************************************/
-#ifdef ARDUINO
-sint8 closeSocket(SOCKET sock)
-#else
 sint8 close(SOCKET sock)
-#endif
 {
 	sint8	s8Ret = SOCK_ERR_INVALID_ARG;
     M2M_INFO("Sock to delete <%d>\n", sock);

src/utility/WiFiSocket.cpp

@@ -76,7 +76,7 @@ SOCKET WiFiSocketClass::create(uint16 u16Domain, uint8 u8Type, uint8 u8Flags)
 
 sint8 WiFiSocketClass::bind(SOCKET sock, struct sockaddr *pstrAddr, uint8 u8AddrLen)
 {
-	if (bindSocket(sock, pstrAddr, u8AddrLen) < 0) {
+	if (::bind(sock, pstrAddr, u8AddrLen) < 0) {
 		return 0;
 	}
 
@@ -106,7 +106,7 @@ sint8 WiFiSocketClass::bind(SOCKET sock, struct sockaddr *pstrAddr, uint8 u8Addr
 
 sint8 WiFiSocketClass::listen(SOCKET sock, uint8 backlog)
 {
-	if (listenSocket(sock, backlog) < 0) {
+	if (::listen(sock, backlog) < 0) {
 		return 0;
 	}
 
@@ -133,7 +133,7 @@ sint8 WiFiSocketClass::setopt(SOCKET socket, uint8 u8Level, uint8 option_name, c
 
 sint8 WiFiSocketClass::connect(SOCKET sock, struct sockaddr *pstrAddr, uint8 u8AddrLen)
 {
-	if (connectSocket(sock, pstrAddr, u8AddrLen) < 0) {
+	if (::connect(sock, pstrAddr, u8AddrLen) < 0) {
 		return 0;
 	}
 
@@ -308,7 +308,7 @@ sint16 WiFiSocketClass::sendto(SOCKET sock, void *pvSendBuffer, uint16 u16SendLe
 		return 0;
 	}
 
-	return sendtoSocket(sock, pvSendBuffer, u16SendLength, flags, pstrDestAddr, u8AddrLen);
+	return ::sendto(sock, pvSendBuffer, u16SendLength, flags, pstrDestAddr, u8AddrLen);
 }
 
 sint8 WiFiSocketClass::close(SOCKET sock)
@@ -335,7 +335,7 @@ sint8 WiFiSocketClass::close(SOCKET sock)
 	_info[sock].buffer.length = 0;
 	_info[sock].recvMsg.s16BufferSize = 0;
 
-	return closeSocket(sock);
+	return ::close(sock);
 }
 
 int WiFiSocketClass::hasParent(SOCKET sock, SOCKET child)