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/net/SocketDescriptor.cxx
+++ b/src/net/SocketDescriptor.cxx
@@ -108,7 +108,7 @@ SocketDescriptor::Connect(SocketAddress address)
 bool
 SocketDescriptor::Create(int domain, int type, int protocol)
 {
-#ifdef WIN32
+#ifdef _WIN32
 	static bool initialised = false;
 	if (!initialised) {
 		WSADATA data;