Earnie Boyd
b701af168c
* include/mswsock.h: New file.
* include/ws2tcpip.h: New file.
* include/winsock.h (IPPROTO_IGMP): New define.
(IPPROTO_GGP): Correct value.
(SO_* macros): Remove mswsock defines.
(TCP_BSDURGENT): Likewise.
(IP_* macros): Add comment warning of WinSock2 incompatibility
(WSARecvEx): Remove mswsock prototype.
(TransmitFile): Likewise.
(AcceptEx): Likewise.
(GetAcceptExSockaddrs): Likewise.
(struct _TRANSMIT_FILE_BUFFERS): Remove mswsock definition.
(#include <mswsock.h>): Add directive and explanatory comment
* include/winsock2.h (header guard): add guard for _WINSOCK_H
(_WINSOCK_H): Define to prevent later inclusion of winsock.h
(#include <winsock.h>): Replace directive with winsock.h file content
The following changes apply to the merged file:
(FD_SET): Keep winsock2.h definition, delete winsock.h definition
(SOMAXCONN): Likewise
(#include <nspapi.h>): Move - don't include until LPSOCKADDR defined
(IP_* macros): Delete WinSock1 definitions (WinSock2 definitions now
in ws2tcpip.h)
(struct ip_mreq): Delete (now defined in ws2tcpip.h for WinSock2)
(FD_*_BIT and FD_* defines): Place together and extend to
FD_MAX_EVENTS 10
(AF* defines): Extend to AF_MAX 10
(WSAIsBlocking): #if 0 out prototype (N/A in WinSock2)
(WSAUnhookBlockingHook): Likewise.
(WSASetBlockingHook): Likewise.
(WSACancelBlockingCall): Likewise.
(WSAEINPROGRESS): Comment as not raised in WinSock2.
(#include <mswsock.h>): Delete directive inherited from winsock.h
(WSA_QOS* defines): Add QualityOfService error codes.
(SIO_* defines): Add new macros
* include/ipexport.h (IP_STATUS flags): Add definitions.
(IP_FLAG_DF): Likewise.
(IP_OPT_* ): Likewise.
(struct ip_option_information): Likewise.
(struct icmp_echo_reply): Likewise.
2001-02-21 20:40:47 +00:00
..
2000-11-01 00:37:23 +00:00
2000-11-01 00:37:23 +00:00
2000-02-17 19:38:33 +00:00
2000-02-17 19:38:33 +00:00
2001-02-21 19:31:54 +00:00
2000-02-17 19:38:33 +00:00
2000-02-17 19:38:33 +00:00
2000-02-17 19:38:33 +00:00
2000-02-17 19:38:33 +00:00
2000-02-17 19:38:33 +00:00
2000-02-17 19:38:33 +00:00
2000-04-25 19:13:51 +00:00
2000-02-17 19:38:33 +00:00
2000-02-17 19:38:31 +00:00
2000-02-17 19:38:33 +00:00
2000-02-17 19:38:33 +00:00
2000-02-17 19:38:33 +00:00
2000-02-17 19:38:33 +00:00
2000-02-17 19:38:33 +00:00
2001-02-21 20:40:47 +00:00
2000-10-08 16:55:29 +00:00
2000-10-08 16:55:29 +00:00
2000-10-09 09:51:46 +00:00
2001-01-30 14:37:54 +00:00
2000-02-17 19:38:33 +00:00
2000-02-29 03:16:14 +00:00
2000-11-01 00:37:23 +00:00
2000-02-17 19:38:33 +00:00
2001-02-21 19:31:54 +00:00
2000-02-17 19:38:33 +00:00
2000-02-17 19:38:33 +00:00
2000-02-17 19:38:33 +00:00
2000-02-17 19:38:33 +00:00
2000-02-17 19:38:33 +00:00
2000-02-17 19:38:33 +00:00
2001-02-21 19:31:54 +00:00
2000-11-01 00:37:23 +00:00
2000-02-17 19:38:33 +00:00
2000-02-17 19:38:33 +00:00
2000-02-17 19:38:33 +00:00
2000-02-17 19:38:33 +00:00
2000-11-01 00:37:23 +00:00
2000-11-01 00:37:23 +00:00
2001-02-21 19:31:54 +00:00
2000-11-01 00:37:23 +00:00
2001-02-21 19:31:54 +00:00
2000-11-01 00:37:23 +00:00
2000-02-17 19:38:33 +00:00
2000-02-17 19:38:33 +00:00
2000-02-17 19:38:33 +00:00
2000-02-17 19:38:33 +00:00
2000-02-17 19:38:33 +00:00
2000-02-17 19:38:33 +00:00
2001-02-21 20:40:47 +00:00
2000-02-17 19:38:33 +00:00
2000-02-17 19:38:33 +00:00
2000-02-17 19:38:33 +00:00
2000-10-09 09:51:46 +00:00
2001-02-21 19:31:54 +00:00
2000-02-17 19:38:33 +00:00
2001-01-26 21:05:20 +00:00
2000-02-17 19:38:33 +00:00
2001-01-30 13:34:50 +00:00
2000-02-17 19:38:33 +00:00
2001-01-16 18:23:52 +00:00
2000-02-17 19:38:33 +00:00
2000-02-17 19:38:33 +00:00
2000-03-30 06:08:58 +00:00
2000-11-01 00:37:23 +00:00
2000-02-17 19:38:33 +00:00
2000-02-17 19:38:33 +00:00
2001-02-21 19:31:54 +00:00
2000-02-17 19:38:33 +00:00
2000-02-17 19:38:33 +00:00
2000-02-17 19:38:33 +00:00
2000-02-17 19:38:33 +00:00
2000-02-17 19:38:33 +00:00
2000-02-17 19:38:33 +00:00
2000-02-17 19:38:33 +00:00
2000-02-17 19:38:33 +00:00
2000-02-17 19:38:33 +00:00
2000-02-24 18:04:23 +00:00
2001-02-21 19:31:54 +00:00
2000-11-01 00:37:23 +00:00
2000-11-01 00:37:23 +00:00
2001-02-21 19:31:54 +00:00
2001-02-21 19:31:54 +00:00
2000-02-17 19:38:33 +00:00
2000-02-17 19:38:33 +00:00
2000-02-17 19:38:33 +00:00
2001-01-26 21:05:20 +00:00
2000-03-30 06:08:58 +00:00
2000-11-01 00:37:23 +00:00
2000-02-17 19:38:33 +00:00
2000-02-17 19:38:33 +00:00
2000-02-17 19:38:33 +00:00
2000-02-17 19:38:33 +00:00
2000-02-17 19:38:33 +00:00
2000-02-17 19:38:33 +00:00
2000-02-17 19:38:33 +00:00
2001-02-13 21:39:57 +00:00
2001-01-28 16:21:01 +00:00
2001-01-28 16:21:01 +00:00
2001-01-28 16:21:01 +00:00
2001-01-16 19:02:04 +00:00
2000-10-09 09:51:46 +00:00
2000-02-29 03:07:07 +00:00
2000-02-17 19:38:33 +00:00
2000-08-08 20:00:35 +00:00
2001-02-15 17:28:40 +00:00
2001-01-26 21:05:20 +00:00
2000-02-17 19:38:33 +00:00
2000-05-27 13:59:33 +00:00
2000-06-22 18:37:31 +00:00
2000-07-27 17:30:51 +00:00
2000-11-01 00:37:23 +00:00
2000-03-30 06:10:11 +00:00
2000-04-25 19:13:51 +00:00
2001-02-21 19:31:54 +00:00
2000-11-01 00:37:23 +00:00
2000-11-01 00:37:23 +00:00
2000-12-05 17:26:01 +00:00
2001-02-21 19:31:54 +00:00
2000-02-17 19:38:33 +00:00
2000-02-17 19:38:33 +00:00
2000-02-17 19:38:33 +00:00
2001-02-21 20:40:47 +00:00
2001-02-21 20:40:47 +00:00
2000-04-25 19:22:31 +00:00
2000-02-17 19:38:33 +00:00
2001-01-30 14:59:29 +00:00
2000-02-17 19:38:33 +00:00
2001-02-21 20:40:47 +00:00
2000-11-01 00:37:23 +00:00
2000-02-17 19:38:33 +00:00