Merge branch 'v0.20.x'

This commit is contained in:
Max Kellermann
2017-12-16 20:50:53 +01:00
105 changed files with 270 additions and 240 deletions
+1 -1
View File
@@ -34,7 +34,7 @@
#include <algorithm>
#ifdef WIN32
#ifdef _WIN32
#include <ws2tcpip.h>
#else
#include <netdb.h>