libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

* include/mswsock.h: Group winsock2 dependants 

together and protect with #ifdef _WINSOCK2_H.
	* lib/test.c: Only test ws2tcpip.h if winsock2.h
	has been included.
This commit is contained in:
Danny Smith 2002-03-06 11:31:47 +00:00
parent 55f26f1194
commit b7410006b9
3 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
winsup/w32api/ChangeLog
View File

@ -1,3 +1,10 @@
2002-03-06 dannysmith@users.sourceforge.net
* include/mswsock.h: Group winsock2 dependants
together and protect with #ifdef _WINSOCK2_H.
* lib/test.c: Only test ws2tcpip.h if winsock2.h
has been included.
2002-03-05 dannysmith@users.sourceforge.net
* include/mswsock.h (TP_*): Add new defines.

23
winsup/w32api/include/mswsock.h
View File

@ -1,6 +1,6 @@
/*
* mswsock.h
* MS-specific extensions to Windows Sockets 1.1, exported from mswsock.dll.
* MS-specific extensions to Windows Sockets, exported from mswsock.dll.
* These functions are N/A on Windows9x.
*
* This file is part of a free library for the Win32 API.
@ -40,10 +40,6 @@ extern "C" {
#define TF_USE_SYSTEM_THREAD 16
#define TF_USE_KERNEL_APC 32
#define TP_ELEMENT_FILE 1
#define TP_ELEMENT_MEMORY 2
#define TP_ELEMENT_EOP 4
typedef struct _TRANSMIT_FILE_BUFFERS {
PVOID Head;
DWORD HeadLength;
@ -51,6 +47,17 @@ typedef struct _TRANSMIT_FILE_BUFFERS {
DWORD TailLength;
} TRANSMIT_FILE_BUFFERS, *PTRANSMIT_FILE_BUFFERS, *LPTRANSMIT_FILE_BUFFERS;
int PASCAL WSARecvEx(SOCKET,char*,int,int*);
BOOL PASCAL TransmitFile(SOCKET,HANDLE,DWORD,DWORD,LPOVERLAPPED,LPTRANSMIT_FILE_BUFFERS,DWORD);
BOOL PASCAL AcceptEx(SOCKET,SOCKET,PVOID,DWORD,DWORD,DWORD,LPDWORD,LPOVERLAPPED);
VOID PASCAL GetAcceptExSockaddrs(PVOID,DWORD,DWORD,DWORD,struct sockaddr**, LPINT, struct sockaddr**, LPINT);
#ifdef WINSOCK2_H /* These require the winsock2 interface. */
#define TP_ELEMENT_FILE 1
#define TP_ELEMENT_MEMORY 2
#define TP_ELEMENT_EOP 4
typedef struct _TRANSMIT_PACKETS_ELEMENT {
ULONG dwElFlags;
ULONG cLength;
@ -92,13 +99,11 @@ typedef struct wsacmsghdr {
#define WSA_CMSG_LEN(length)
#endif
int PASCAL WSARecvEx(SOCKET,char*,int,int*);
BOOL PASCAL TransmitFile(SOCKET,HANDLE,DWORD,DWORD,LPOVERLAPPED,LPTRANSMIT_FILE_BUFFERS,DWORD);
BOOL PASCAL AcceptEx(SOCKET,SOCKET,PVOID,DWORD,DWORD,DWORD,LPDWORD,LPOVERLAPPED);
VOID PASCAL GetAcceptExSockaddrs(PVOID,DWORD,DWORD,DWORD,struct sockaddr**, LPINT, struct sockaddr**, LPINT);
BOOL PASCAL DisconnectEx(SOCKET,LPOVERLAPPED,DWORD,DWORD);
int PASCAL WSARecvMsg(SOCKET,LPWSAMSG,LPDWORD,LPWSAOVERLAPPED,LPWSAOVERLAPPED_COMPLETION_ROUTINE);
#endif /* WINSOCK2_H */
#ifdef __cplusplus
}
#endif

2
winsup/w32api/lib/test.c
View File

@ -55,7 +55,9 @@
#include <winioctl.h>
#include <winresrc.h>
#include <winsock.h>
#ifdef _WINSOCK2_H
#include <ws2tcpip.h>
#endif
#include <wsnetbs.h>
#include <setupapi.h>
#include <aclapi.h>