Christopher Faylor
c35bcd3ebc
* include/winsock2.h: Protect some more newlib defines when compiling cygwin
2001-04-24 03:41:37 +00:00
Christopher Faylor
dac9c6045f
* include/winsock.h (_SYS_TYPES_H macro guard for int types): Remove; use only
...
_BSDTYPES_DEFINED macro now defined in newlib sys/types.h.
(SYS_TYPES_H macro guard for fd_set): Replace with_SYS_TYPES_FD_SET macro now
defined in newlib sys/types.h. Emit warning if defined.
* include/winsock2.h: Ditto.
* include/windows.h (Win32_Winsock): Replace with new macros __USE_W32_SOCKETS
and warn of deprecation.
2001-03-20 19:27:37 +00:00
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
Mumit Khan
1756811b99
2000-02-28 Mumit Khan <khan@xraylith.wisc.edu>
...
Patches from Jan Nijtmans <j.nijtmans@chello.nl>:
* include/wtypes.h (PBLOB, LPBLOB): Define.
* include/winsock2.h: Much more complete version.
(FD_SET, SOMAXCONN): Protect common macros defined by winsock.h.
2000-02-29 03:14:40 +00:00
Christopher Faylor
1fd5e000ac
import winsup-2000-02-17 snapshot
2000-02-17 19:38:33 +00:00