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
--- a/src/event/MultiSocketMonitor.hxx
+++ b/src/event/MultiSocketMonitor.hxx
@@ -31,7 +31,7 @@

 #include <assert.h>

-#ifndef WIN32
+#ifndef _WIN32
 struct pollfd;
 #endif

@@ -184,7 +184,7 @@ public:
 		}
 	}

-#ifndef WIN32
+#ifndef _WIN32
 	/**
 	 * Replace the socket list with the given file descriptors.
 	 * The given pollfd array will be modified by this method.
--- a/src/event/ServerSocket.cxx
+++ b/src/event/ServerSocket.cxx
@@ -44,7 +44,7 @@
 #include <unistd.h>
 #include <assert.h>

-#ifdef WIN32
+#ifdef _WIN32
 #include <ws2tcpip.h>
 #include <winsock.h>
 #else
--- a/src/event/SignalMonitor.cxx
+++ b/src/event/SignalMonitor.cxx
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "SignalMonitor.hxx"

-#ifndef WIN32
+#ifndef _WIN32

 #include "SocketMonitor.hxx"
 #include "util/Manual.hxx"
--- a/src/event/SignalMonitor.hxx
+++ b/src/event/SignalMonitor.hxx
@@ -24,7 +24,7 @@

 class EventLoop;

-#ifndef WIN32
+#ifndef _WIN32

 #include "util/BindMethod.hxx"

--- a/src/event/SocketMonitor.cxx
+++ b/src/event/SocketMonitor.cxx
@@ -23,7 +23,7 @@

 #include <assert.h>

-#ifdef WIN32
+#ifdef _WIN32
 #include <winsock2.h>
 #else
 #include <sys/socket.h>