Implementation of WSAStringToAddress(A/W), WSAHtonl, WSAHtons.

diff --git a/include/winsock2.h b/include/winsock2.h
index 21cc3c7..0e4c32f 100644
--- a/include/winsock2.h
+++ b/include/winsock2.h
@@ -558,10 +558,10 @@
 /* WSASetServiceW */
 SOCKET WINAPI WSASocketA(int,int,int,LPWSAPROTOCOL_INFOA,GROUP,DWORD);
 SOCKET WINAPI WSASocketW(int,int,int,LPWSAPROTOCOL_INFOW,GROUP,DWORD);
+#define WSASocket WINELIB_NAME_AW(WSASocket)
 INT WINAPI WSAStringToAddressA(LPSTR,INT,LPWSAPROTOCOL_INFOA,LPSOCKADDR,LPINT);
-INT WINAPI WSAStringToAddressW(LPSTR,INT,LPWSAPROTOCOL_INFOA,LPSOCKADDR,LPINT);
-#define WSASocket                  WINELIB_NAME_AW(WSASocket)
-#define WSAStringToAddress         WINELIB_NAME_AW(WSAStringToAddress)
+INT WINAPI WSAStringToAddressW(LPWSTR,INT,LPWSAPROTOCOL_INFOW,LPSOCKADDR,LPINT);
+#define WSAStringToAddress WINELIB_NAME_AW(WSAStringToAddress)
 DWORD WINAPI WSAWaitForMultipleEvents(DWORD,const WSAEVENT*,BOOL,DWORD,BOOL);
 #endif /* WS_API_PROTOTYPES */