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/cloud/googledrive/googledrivestorage.cpp | 2 +- backends/cloud/googledrive/googledrivetokenrefresher.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'backends/cloud/googledrive') diff --git a/backends/cloud/googledrive/googledrivestorage.cpp b/backends/cloud/googledrive/googledrivestorage.cpp index c00d954966..4a870c01b6 100644 --- a/backends/cloud/googledrive/googledrivestorage.cpp +++ b/backends/cloud/googledrive/googledrivestorage.cpp @@ -22,6 +22,7 @@ #define FORBIDDEN_SYMBOL_ALLOW_ALL +#include #include "backends/cloud/googledrive/googledrivestorage.h" #include "backends/cloud/cloudmanager.h" #include "backends/cloud/googledrive/googledrivetokenrefresher.h" @@ -34,7 +35,6 @@ #include "common/debug.h" #include "common/json.h" #include "common/debug.h" -#include #ifdef ENABLE_RELEASE #include "dists/clouds/cloud_keys.h" diff --git a/backends/cloud/googledrive/googledrivetokenrefresher.cpp b/backends/cloud/googledrive/googledrivetokenrefresher.cpp index a8d9d55bad..a32a7fcbed 100644 --- a/backends/cloud/googledrive/googledrivetokenrefresher.cpp +++ b/backends/cloud/googledrive/googledrivetokenrefresher.cpp @@ -22,12 +22,12 @@ #define FORBIDDEN_SYMBOL_ALLOW_ALL +#include #include "backends/cloud/googledrive/googledrivetokenrefresher.h" #include "backends/cloud/googledrive/googledrivestorage.h" #include "backends/networking/curl/networkreadstream.h" #include "common/debug.h" #include "common/json.h" -#include namespace Cloud { namespace GoogleDrive { -- cgit v1.2.3