diff options
| author | Danny Smith <dannysmith@users.sourceforge.net> | 2004-10-18 08:31:16 +0400 |
|---|---|---|
| committer | Danny Smith <dannysmith@users.sourceforge.net> | 2004-10-18 08:31:16 +0400 |
| commit | b64293e62a6094050d51b7360492b81b7d643f3b (patch) | |
| tree | 7f45c9b3112bbb2c99a177ed942e2c432e88f681 /winsup/w32api | |
| parent | 3f8c5ee627dd97803c5cf2faba2677f30713f13c (diff) | |
= include/wsahelp.h (WINSOCK_MAPPING, WSHGetWinsockMapping,
PWSH_GET_WINSOCK_MAPPING): Don't define if __OBJC__.
Diffstat (limited to 'winsup/w32api')
| -rw-r--r-- | winsup/w32api/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/w32api/include/wsahelp.h | 26 |
2 files changed, 20 insertions, 11 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index a8afaf14c..3a31e45f6 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,8 @@ +2004-10-18 Danny Smith <dannysmith@users.sourceforge.net> + + = include/wsahelp.h (WINSOCK_MAPPING, WSHGetWinsockMapping, + PWSH_GET_WINSOCK_MAPPING): Don't define if __OBJC__. + 2004-10-15 Robert Wruck <wruck@tweerlei.de> Danny Smith <dannysmith@users.sourceforge.net> diff --git a/winsup/w32api/include/wsahelp.h b/winsup/w32api/include/wsahelp.h index 3c715e622..bcdeba87d 100644 --- a/winsup/w32api/include/wsahelp.h +++ b/winsup/w32api/include/wsahelp.h @@ -31,15 +31,6 @@ typedef enum _SOCKADDR_ENDPOINT_INFO { SockaddrEndpointInfoWildcard, SockaddrEndpointInfoReserved } SOCKADDR_ENDPOINT_INFO, *PSOCKADDR_ENDPOINT_INFO; -typedef struct _WINSOCK_MAPPING { - DWORD Rows; - DWORD Columns; - struct { - DWORD AddressFamily; - DWORD SocketType; - DWORD Protocol; - } Mapping[1]; -} WINSOCK_MAPPING, *PWINSOCK_MAPPING; typedef struct _SOCKADDR_INFO { SOCKADDR_ADDRESS_INFO AddressInfo; SOCKADDR_ENDPOINT_INFO EndpointInfo; @@ -52,7 +43,6 @@ INT WINAPI WSHGetProviderGuid(LPWSTR,LPGUID); INT WINAPI WSHGetSockaddrType(PSOCKADDR,DWORD,PSOCKADDR_INFO); INT WINAPI WSHGetSocketInformation(PVOID,SOCKET,HANDLE,HANDLE,INT,INT,PCHAR,INT); INT WINAPI WSHGetWildcardSockaddr(PVOID,PSOCKADDR,PINT); -DWORD WINAPI WSHGetWinsockMapping(PWINSOCK_MAPPING,DWORD); INT WINAPI WSHGetWSAProtocolInfo(LPWSTR,LPWSAPROTOCOL_INFOW*,LPDWORD); INT WINAPI WSHIoctl(PVOID,SOCKET,HANDLE,HANDLE,DWORD,LPVOID,DWORD,LPVOID,DWORD, LPDWORD,LPWSAOVERLAPPED,LPWSAOVERLAPPED_COMPLETION_ROUTINE,LPBOOL); @@ -71,7 +61,6 @@ typedef INT (WINAPI *PWSH_GET_PROVIDER_GUID)(LPWSTR,LPGUID); typedef INT (WINAPI *PWSH_GET_SOCKADDR_TYPE)(PSOCKADDR,DWORD,PSOCKADDR_INFO); typedef INT (WINAPI *PWSH_GET_SOCKET_INFORMATION)(PVOID,SOCKET,HANDLE,HANDLE,INT,INT,PCHAR,INT); typedef INT (WINAPI *PWSH_GET_WILDCARD_SOCKEADDR)(PVOID,PSOCKADDR,PINT); -typedef DWORD (WINAPI *PWSH_GET_WINSOCK_MAPPING)(PWINSOCK_MAPPING,DWORD); typedef INT (WINAPI *PWSH_GET_WSAPROTOCOL_INFO)(LPWSTR,LPWSAPROTOCOL_INFOW*,LPDWORD); typedef INT (WINAPI *PWSH_IOCTL)(PVOID,SOCKET,HANDLE,HANDLE,DWORD,LPVOID,DWORD, LPVOID,DWORD,LPDWORD,LPWSAOVERLAPPED,LPWSAOVERLAPPED_COMPLETION_ROUTINE,LPBOOL); @@ -83,6 +72,21 @@ typedef INT (WINAPI *PWSH_OPEN_SOCKET2)(PINT,PINT,PINT,GROUP,DWORD,PUNICODE_STRI typedef INT (WINAPI *PWSH_SET_SOCKET_INFORMATION)(PVOID,SOCKET,HANDLE,HANDLE,INT,INT,PCHAR,INT); typedef INT (WINAPI *PWSH_STRING_TO_ADDRESS)(LPWSTR,DWORD,LPWSAPROTOCOL_INFOW,LPSOCKADDR,LPDWORD); +#ifndef __OBJC__ +/* "Protocol" is a builtin class name in ObjC. */ +typedef struct _WINSOCK_MAPPING { + DWORD Rows; + DWORD Columns; + struct { + DWORD AddressFamily; + DWORD SocketType; + DWORD Protocol; + } Mapping[1]; +} WINSOCK_MAPPING, *PWINSOCK_MAPPING; +DWORD WINAPI WSHGetWinsockMapping(PWINSOCK_MAPPING,DWORD); +typedef DWORD (WINAPI *PWSH_GET_WINSOCK_MAPPING)(PWINSOCK_MAPPING,DWORD); +#endif + #endif /* RC_INVOKED */ #ifdef __cplusplus |