Skip to content

Commit 728b040

Browse files
committed
Upgrade libuv to 4ac1309
Fixes #1857
1 parent 6fadbec commit 728b040

File tree

3 files changed

+71
-72
lines changed

3 files changed

+71
-72
lines changed

deps/uv/config-unix.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
1919
# IN THE SOFTWARE.
2020

21-
CC = $(PREFIX)gcc
22-
AR = $(PREFIX)ar
2321
E=
2422
CSTDFLAG=--std=c89 -pedantic -Wall -Wextra -Wno-unused-parameter
2523
CFLAGS += -g

deps/uv/include/uv-private/uv-win.h

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,77 @@
3434

3535
#define MAX_PIPENAME_LEN 256
3636

37+
/*
38+
* Guids and typedefs for winsock extension functions
39+
* Mingw32 doesn't have these :-(
40+
*/
41+
#ifndef WSAID_ACCEPTEX
42+
# define WSAID_ACCEPTEX \
43+
{0xb5367df1, 0xcbac, 0x11cf, \
44+
{0x95, 0xca, 0x00, 0x80, 0x5f, 0x48, 0xa1, 0x92}}
45+
46+
# define WSAID_CONNECTEX \
47+
{0x25a207b9, 0xddf3, 0x4660, \
48+
{0x8e, 0xe9, 0x76, 0xe5, 0x8c, 0x74, 0x06, 0x3e}}
49+
50+
# define WSAID_GETACCEPTEXSOCKADDRS \
51+
{0xb5367df2, 0xcbac, 0x11cf, \
52+
{0x95, 0xca, 0x00, 0x80, 0x5f, 0x48, 0xa1, 0x92}}
53+
54+
# define WSAID_DISCONNECTEX \
55+
{0x7fda2e11, 0x8630, 0x436f, \
56+
{0xa0, 0x31, 0xf5, 0x36, 0xa6, 0xee, 0xc1, 0x57}}
57+
58+
# define WSAID_TRANSMITFILE \
59+
{0xb5367df0, 0xcbac, 0x11cf, \
60+
{0x95, 0xca, 0x00, 0x80, 0x5f, 0x48, 0xa1, 0x92}}
61+
62+
typedef BOOL PASCAL (*LPFN_ACCEPTEX)
63+
(SOCKET sListenSocket,
64+
SOCKET sAcceptSocket,
65+
PVOID lpOutputBuffer,
66+
DWORD dwReceiveDataLength,
67+
DWORD dwLocalAddressLength,
68+
DWORD dwRemoteAddressLength,
69+
LPDWORD lpdwBytesReceived,
70+
LPOVERLAPPED lpOverlapped);
71+
72+
typedef BOOL PASCAL (*LPFN_CONNECTEX)
73+
(SOCKET s,
74+
const struct sockaddr* name,
75+
int namelen,
76+
PVOID lpSendBuffer,
77+
DWORD dwSendDataLength,
78+
LPDWORD lpdwBytesSent,
79+
LPOVERLAPPED lpOverlapped);
80+
81+
typedef void PASCAL (*LPFN_GETACCEPTEXSOCKADDRS)
82+
(PVOID lpOutputBuffer,
83+
DWORD dwReceiveDataLength,
84+
DWORD dwLocalAddressLength,
85+
DWORD dwRemoteAddressLength,
86+
LPSOCKADDR* LocalSockaddr,
87+
LPINT LocalSockaddrLength,
88+
LPSOCKADDR* RemoteSockaddr,
89+
LPINT RemoteSockaddrLength);
90+
91+
typedef BOOL PASCAL (*LPFN_DISCONNECTEX)
92+
(SOCKET hSocket,
93+
LPOVERLAPPED lpOverlapped,
94+
DWORD dwFlags,
95+
DWORD reserved);
96+
97+
typedef BOOL PASCAL (*LPFN_TRANSMITFILE)
98+
(SOCKET hSocket,
99+
HANDLE hFile,
100+
DWORD nNumberOfBytesToWrite,
101+
DWORD nNumberOfBytesPerSend,
102+
LPOVERLAPPED lpOverlapped,
103+
LPTRANSMIT_FILE_BUFFERS lpTransmitBuffers,
104+
DWORD dwFlags);
105+
#endif
106+
107+
37108
/**
38109
* It should be possible to cast uv_buf_t[] to WSABUF[]
39110
* see http://msdn.microsoft.com/en-us/library/ms741542(v=vs.85).aspx

deps/uv/src/win/winsock.h

Lines changed: 0 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -28,76 +28,6 @@
2828
#include <windows.h>
2929

3030

31-
/*
32-
* Guids and typedefs for winsock extension functions
33-
* Mingw32 doesn't have these :-(
34-
*/
35-
#ifndef WSAID_ACCEPTEX
36-
# define WSAID_ACCEPTEX \
37-
{0xb5367df1, 0xcbac, 0x11cf, \
38-
{0x95, 0xca, 0x00, 0x80, 0x5f, 0x48, 0xa1, 0x92}}
39-
40-
# define WSAID_CONNECTEX \
41-
{0x25a207b9, 0xddf3, 0x4660, \
42-
{0x8e, 0xe9, 0x76, 0xe5, 0x8c, 0x74, 0x06, 0x3e}}
43-
44-
# define WSAID_GETACCEPTEXSOCKADDRS \
45-
{0xb5367df2, 0xcbac, 0x11cf, \
46-
{0x95, 0xca, 0x00, 0x80, 0x5f, 0x48, 0xa1, 0x92}}
47-
48-
# define WSAID_DISCONNECTEX \
49-
{0x7fda2e11, 0x8630, 0x436f, \
50-
{0xa0, 0x31, 0xf5, 0x36, 0xa6, 0xee, 0xc1, 0x57}}
51-
52-
# define WSAID_TRANSMITFILE \
53-
{0xb5367df0, 0xcbac, 0x11cf, \
54-
{0x95, 0xca, 0x00, 0x80, 0x5f, 0x48, 0xa1, 0x92}}
55-
56-
typedef BOOL PASCAL (*LPFN_ACCEPTEX)
57-
(SOCKET sListenSocket,
58-
SOCKET sAcceptSocket,
59-
PVOID lpOutputBuffer,
60-
DWORD dwReceiveDataLength,
61-
DWORD dwLocalAddressLength,
62-
DWORD dwRemoteAddressLength,
63-
LPDWORD lpdwBytesReceived,
64-
LPOVERLAPPED lpOverlapped);
65-
66-
typedef BOOL PASCAL (*LPFN_CONNECTEX)
67-
(SOCKET s,
68-
const struct sockaddr* name,
69-
int namelen,
70-
PVOID lpSendBuffer,
71-
DWORD dwSendDataLength,
72-
LPDWORD lpdwBytesSent,
73-
LPOVERLAPPED lpOverlapped);
74-
75-
typedef void PASCAL (*LPFN_GETACCEPTEXSOCKADDRS)
76-
(PVOID lpOutputBuffer,
77-
DWORD dwReceiveDataLength,
78-
DWORD dwLocalAddressLength,
79-
DWORD dwRemoteAddressLength,
80-
LPSOCKADDR* LocalSockaddr,
81-
LPINT LocalSockaddrLength,
82-
LPSOCKADDR* RemoteSockaddr,
83-
LPINT RemoteSockaddrLength);
84-
85-
typedef BOOL PASCAL (*LPFN_DISCONNECTEX)
86-
(SOCKET hSocket,
87-
LPOVERLAPPED lpOverlapped,
88-
DWORD dwFlags,
89-
DWORD reserved);
90-
91-
typedef BOOL PASCAL (*LPFN_TRANSMITFILE)
92-
(SOCKET hSocket,
93-
HANDLE hFile,
94-
DWORD nNumberOfBytesToWrite,
95-
DWORD nNumberOfBytesPerSend,
96-
LPOVERLAPPED lpOverlapped,
97-
LPTRANSMIT_FILE_BUFFERS lpTransmitBuffers,
98-
DWORD dwFlags);
99-
#endif
100-
10131
/*
10232
* MinGW is missing these too
10333
*/

0 commit comments

Comments
 (0)