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/client/ClientFile.cxx
+++ b/src/client/ClientFile.cxx
@@ -28,7 +28,7 @@
 void
 Client::AllowFile(Path path_fs) const
 {
-#ifdef WIN32
+#ifdef _WIN32
 	(void)path_fs;

 	throw ProtocolError(ACK_ERROR_PERMISSION, "Access denied");
--- a/src/client/ClientMessage.hxx
+++ b/src/client/ClientMessage.hxx
@@ -24,7 +24,7 @@

 #include <string>

-#ifdef WIN32
+#ifdef _WIN32
 /* fuck WIN32! */
 #include <windows.h>
 #undef GetMessage
--- a/src/client/ClientNew.cxx
+++ b/src/client/ClientNew.cxx
@@ -29,7 +29,7 @@
 #include "Log.hxx"

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