Changeset 21420 for trunk/src

Timestamp:

Aug 16, 2010, 4:19:33 PM (15 years ago)

Author:

dmik

Message:

winsock2.h: Added missing WSASend* and WSARecv* declarations.

File:

• trunk/src/ws2_32/socket.cpp (modified) (4 diffs)

trunk/src/ws2_32/socket.cpp

@@ -108 +108 @@
  *              WSAAccept                        (WS2_32.26)
  */
-SOCKET WINAPI WSAAccept( SOCKET s, struct WS_sockaddr *addr, LPINT addrlen,
+SOCKET WINAPI WSAAccept( SOCKET s, struct sockaddr *addr, LPINT addrlen,
                LPCONDITIONPROC lpfnCondition, DWORD dwCallbackData)
 {
@@ -146 +146 @@
                case CF_ACCEPT:
                        if (addr && addrlen)
-                               addr = (struct WS_sockaddr *)memcpy(addr, &src_addr, (*addrlen > size) ?  size : *addrlen );
+                               addr = (struct sockaddr *)memcpy(addr, &src_addr, (*addrlen > size) ?  size : *addrlen );
                        return cs;
                case CF_DEFER:
@@ -171 +171 @@
 INT WINAPI WSASendTo( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount,
                       LPDWORD lpNumberOfBytesSent, DWORD dwFlags,
-                      const struct WS_sockaddr *to, int tolen,
+                      const struct sockaddr *to, int tolen,
                       LPWSAOVERLAPPED lpOverlapped,
                       LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine )
@@ -225 +225 @@
  */
 INT WINAPI WSARecvFrom( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount,
-                        LPDWORD lpNumberOfBytesRecvd, LPDWORD lpFlags, struct WS_sockaddr *lpFrom,
+                        LPDWORD lpNumberOfBytesRecvd, LPDWORD lpFlags, struct sockaddr *lpFrom,
                         LPINT lpFromlen, LPWSAOVERLAPPED lpOverlapped,
                         LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine )