summaryrefslogtreecommitdiff
path: root/src/client
diff options
context:
space:
mode:
authorMax Kellermann <max@musicpd.org>2017-12-16 20:50:53 +0100
committerMax Kellermann <max@musicpd.org>2017-12-16 20:56:06 +0100
commit6246d36fe6503e6bed3bca6aa5ca783c6188d76f (patch)
tree51521bbb43bc2bbbc34a14c393a0f65880aabbbc /src/client
parentfbc4bb29dcc471a08e47f10ffaa24ad8da6d40a2 (diff)
parentf1ef9f9d31c71857db021029326715028a217906 (diff)
Merge branch 'v0.20.x'
Diffstat (limited to 'src/client')
-rw-r--r--src/client/ClientFile.cxx2
-rw-r--r--src/client/ClientMessage.hxx2
-rw-r--r--src/client/ClientNew.cxx2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/client/ClientFile.cxx b/src/client/ClientFile.cxx
index 03827890d..e38974dee 100644
--- 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");
diff --git a/src/client/ClientMessage.hxx b/src/client/ClientMessage.hxx
index b665cd65e..1da871a60 100644
--- 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
diff --git a/src/client/ClientNew.cxx b/src/client/ClientNew.cxx
index 5cfcf750f..11b5bc76c 100644
--- 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>