Skip to content

Commit 3155e31

Browse files
committed
---
yaml --- r: 89693 b: refs/heads/master c: 4ce7d57 h: refs/heads/master i: 89691: 7d8bb33 v: v3
1 parent 2be9ae6 commit 3155e31

File tree

9 files changed

+576
-60
lines changed

9 files changed

+576
-60
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 09257df055ca0ca14c3c71b21d82cfa48c34c97f
2+
refs/heads/master: 4ce7d573e822c1ef1d68e7797c878a6344655447
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
55
refs/heads/try: b160761e35efcd1207112b3b782c06633cf441a8

trunk/src/etc/mingw-fix-include/winsock2.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,15 @@
33

44
#include_next <winsock2.h>
55

6+
// mingw 4.0.x has broken headers (#9246) but mingw-w64 does not.
7+
#if defined(__MINGW_MAJOR_VERSION) && __MINGW_MAJOR_VERSION == 4
8+
69
typedef struct pollfd {
710
SOCKET fd;
811
short events;
912
short revents;
1013
} WSAPOLLFD, *PWSAPOLLFD, *LPWSAPOLLFD;
1114

1215
#endif
16+
17+
#endif // _FIX_WINSOCK2_H

0 commit comments

Comments
 (0)