http: Prevent Windows header leak from HTTPClient.

hrydgard · Jan 9, 2021 · b60074f · b60074f
1 parent e00f894
commit b60074f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/Common/Net/HTTPClient.cpp b/Common/Net/HTTPClient.cpp
@@ -4,13 +4,18 @@
 #include "Common/StringUtils.h"
 
 #ifndef _WIN32
+#include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/select.h>
 #include <sys/socket.h>
 #include <sys/types.h>
+#include <netdb.h>
 #include <unistd.h>
 #define closesocket close
 #else
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
 #include <winsock2.h>
 #include <ws2tcpip.h>
 #include <io.h>

diff --git a/Common/Net/HTTPClient.h b/Common/Net/HTTPClient.h
@@ -7,19 +7,6 @@
 
 #include "Common/Net/Resolve.h"
 
-#ifdef _WIN32
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#else
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#endif
-
 #include "Common/Buffer.h"
 
 namespace net {

diff --git a/Core/Util/GameManager.cpp b/Core/Util/GameManager.cpp
@@ -28,6 +28,9 @@
 #else
 #include "ext/libzip/zip.h"
 #endif
+#ifdef _WIN32
+#include "Common/CommonWindows.h"
+#endif
 #include "Common/Data/Encoding/Utf8.h"
 #include "Common/Data/Format/IniFile.h"
 #include "Common/Log.h"