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/src/event/MultiSocketMonitor.cxx
+++ b/src/event/MultiSocketMonitor.cxx
@@ -23,7 +23,7 @@

 #include <algorithm>

-#ifndef WIN32
+#ifndef _WIN32
 #include <poll.h>
 #endif

@@ -51,7 +51,7 @@ MultiSocketMonitor::ClearSocketList() noexcept
 	fds.clear();
 }

-#ifndef WIN32
+#ifndef _WIN32

 void
 MultiSocketMonitor::ReplaceSocketList(pollfd *pfds, unsigned n) noexcept