Merge branch 'v0.20.x'

2017-12-16 20:50:53 +01:00
parent fbc4bb29dc f1ef9f9d31
commit 6246d36fe6
105 changed files with 270 additions and 240 deletions
--- a/test/ShutdownHandler.cxx
+++ b/test/ShutdownHandler.cxx
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "ShutdownHandler.hxx"

-#ifndef WIN32
+#ifndef _WIN32
 #include "event/SignalMonitor.hxx"
 #include "event/Loop.hxx"

--- a/test/ShutdownHandler.hxx
+++ b/test/ShutdownHandler.hxx
@@ -28,7 +28,7 @@ public:
 	~ShutdownHandler();
 };

-#ifdef WIN32
+#ifdef _WIN32
 ShutdownHandler::ShutdownHandler(EventLoop &loop) {}
 ShutdownHandler::~ShutdownHandler() {}
 #endif
--- a/test/run_resolver.cxx
+++ b/test/run_resolver.cxx
@@ -25,7 +25,7 @@

 #include <stdexcept>

-#ifdef WIN32
+#ifdef _WIN32
 #include <ws2tcpip.h>
 #include <winsock.h>
 #else