projects
/
NextIRCd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2487ad2
)
[IOMultiplexerV2] fixed compiling issue with newer MinGW builds...
author
pk910
<philipp@zoelle1.de>
Tue, 15 Jul 2014 19:18:55 +0000
(21:18 +0200)
committer
pk910
<philipp@zoelle1.de>
Tue, 15 Jul 2014 20:16:16 +0000
(22:16 +0200)
src/IOHandler/IODNSEngine_default.c
patch
|
blob
|
history
src/IOHandler/IOEngine_select.c
patch
|
blob
|
history
src/IOHandler/IOEngine_win32.c
patch
|
blob
|
history
src/IOHandler/IOSockets.c
patch
|
blob
|
history
diff --git
a/src/IOHandler/IODNSEngine_default.c
b/src/IOHandler/IODNSEngine_default.c
index b8189272c7b8c7ed838f1fbb082dfdbb996f5f9d..f27ef94d3dff4d98cfddd16441a8fb740cd6c663 100644
(file)
--- a/
src/IOHandler/IODNSEngine_default.c
+++ b/
src/IOHandler/IODNSEngine_default.c
@@
-21,9
+21,12
@@
#include "IODNSLookup.h"
#ifdef WIN32
#include "IODNSLookup.h"
#ifdef WIN32
+#ifdef _WIN32_WINNT
+#undef _WIN32_WINNT
+#endif
#define _WIN32_WINNT 0x501
#define _WIN32_WINNT 0x501
-#include <windows.h>
#include <winsock2.h>
#include <winsock2.h>
+#include <windows.h>
#include <ws2tcpip.h>
#else
#include <sys/types.h>
#include <ws2tcpip.h>
#else
#include <sys/types.h>
diff --git
a/src/IOHandler/IOEngine_select.c
b/src/IOHandler/IOEngine_select.c
index b725572067b32c213e5cd62894b1021a43710ec3..3c62c4c96e3dced7c8eda56c0bcc64c90a424cad 100644
(file)
--- a/
src/IOHandler/IOEngine_select.c
+++ b/
src/IOHandler/IOEngine_select.c
@@
-26,9
+26,12
@@
#include <string.h>
#include <stdio.h>
#ifdef WIN32
#include <string.h>
#include <stdio.h>
#ifdef WIN32
+#ifdef _WIN32_WINNT
+#undef _WIN32_WINNT
+#endif
#define _WIN32_WINNT 0x501
#define _WIN32_WINNT 0x501
-#include <windows.h>
#include <winsock2.h>
#include <winsock2.h>
+#include <windows.h>
#elif defined HAVE_SYS_SELECT_H
#include <sys/select.h>
#endif
#elif defined HAVE_SYS_SELECT_H
#include <sys/select.h>
#endif
diff --git
a/src/IOHandler/IOEngine_win32.c
b/src/IOHandler/IOEngine_win32.c
index 26ac0a64d6f484e38efeeb1112eb777d661cee18..0a0a7acf73c86a31ca2b4a6e0bcadf36cf95d5d7 100644
(file)
--- a/
src/IOHandler/IOEngine_win32.c
+++ b/
src/IOHandler/IOEngine_win32.c
@@
-22,10
+22,12
@@
#include "IOTimer.h"
#ifdef WIN32
#include "IOTimer.h"
#ifdef WIN32
-
+#ifdef _WIN32_WINNT
+#undef _WIN32_WINNT
+#endif
#define _WIN32_WINNT 0x501
#define _WIN32_WINNT 0x501
-#include <windows.h>
#include <winsock2.h>
#include <winsock2.h>
+#include <windows.h>
/* This is massively kludgy. Unfortunately, the only performant I/O
* multiplexer with halfway decent semantics under Windows is
/* This is massively kludgy. Unfortunately, the only performant I/O
* multiplexer with halfway decent semantics under Windows is
diff --git
a/src/IOHandler/IOSockets.c
b/src/IOHandler/IOSockets.c
index a361126b5540dd10a69160587c9fcfca49bc597c..0f4dfb4fb52bcd15e5b214719236bc937a3c9d00 100644
(file)
--- a/
src/IOHandler/IOSockets.c
+++ b/
src/IOHandler/IOSockets.c
@@
-23,9
+23,12
@@
#include "IOSSLBackend.h"
#ifdef WIN32
#include "IOSSLBackend.h"
#ifdef WIN32
+#ifdef _WIN32_WINNT
+#undef _WIN32_WINNT
+#endif
#define _WIN32_WINNT 0x501
#define _WIN32_WINNT 0x501
-#include <windows.h>
#include <winsock2.h>
#include <winsock2.h>
+#include <windows.h>
#include <ws2tcpip.h>
#else
#include <sys/socket.h>
#include <ws2tcpip.h>
#else
#include <sys/socket.h>