From 272d4105b274391427f92b25b80cbfe68c7997db Mon Sep 17 00:00:00 2001 From: SupSuper Date: Sun, 16 Dec 2018 23:02:06 +0000 Subject: WIN32: Fix libcurl redefining ARRAYSIZE libcurl pulls in Windows headers, so let's include it first to avoid clashing with common headers --- backends/networking/curl/connectionmanager.cpp | 2 +- backends/networking/curl/curljsonrequest.cpp | 2 +- backends/networking/curl/curlrequest.cpp | 2 +- backends/networking/curl/networkreadstream.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'backends/networking/curl') diff --git a/backends/networking/curl/connectionmanager.cpp b/backends/networking/curl/connectionmanager.cpp index d8662ab78d..7698ddad14 100644 --- a/backends/networking/curl/connectionmanager.cpp +++ b/backends/networking/curl/connectionmanager.cpp @@ -22,12 +22,12 @@ #define FORBIDDEN_SYMBOL_ALLOW_ALL +#include #include "backends/networking/curl/connectionmanager.h" #include "backends/networking/curl/networkreadstream.h" #include "common/debug.h" #include "common/system.h" #include "common/timer.h" -#include namespace Common { diff --git a/backends/networking/curl/curljsonrequest.cpp b/backends/networking/curl/curljsonrequest.cpp index 7764e11950..15fabf9007 100644 --- a/backends/networking/curl/curljsonrequest.cpp +++ b/backends/networking/curl/curljsonrequest.cpp @@ -22,12 +22,12 @@ #define FORBIDDEN_SYMBOL_ALLOW_ALL +#include #include "backends/networking/curl/curljsonrequest.h" #include "backends/networking/curl/connectionmanager.h" #include "backends/networking/curl/networkreadstream.h" #include "common/debug.h" #include "common/json.h" -#include namespace Networking { diff --git a/backends/networking/curl/curlrequest.cpp b/backends/networking/curl/curlrequest.cpp index 7ee8d66c66..a9de30cfe9 100644 --- a/backends/networking/curl/curlrequest.cpp +++ b/backends/networking/curl/curlrequest.cpp @@ -22,11 +22,11 @@ #define FORBIDDEN_SYMBOL_ALLOW_ALL +#include #include "backends/networking/curl/curlrequest.h" #include "backends/networking/curl/connectionmanager.h" #include "backends/networking/curl/networkreadstream.h" #include "common/textconsole.h" -#include namespace Networking { diff --git a/backends/networking/curl/networkreadstream.cpp b/backends/networking/curl/networkreadstream.cpp index 20488401dd..ac8800b22a 100644 --- a/backends/networking/curl/networkreadstream.cpp +++ b/backends/networking/curl/networkreadstream.cpp @@ -22,10 +22,10 @@ #define FORBIDDEN_SYMBOL_ALLOW_ALL +#include #include "backends/networking/curl/networkreadstream.h" #include "backends/networking/curl/connectionmanager.h" #include "base/version.h" -#include namespace Networking { -- cgit v1.2.3