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/onedrive/onedrivestorage.cpp | 2 +- backends/cloud/onedrive/onedrivetokenrefresher.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'backends/cloud/onedrive') diff --git a/backends/cloud/onedrive/onedrivestorage.cpp b/backends/cloud/onedrive/onedrivestorage.cpp index 14e803d980..9f7cad2e01 100644 --- a/backends/cloud/onedrive/onedrivestorage.cpp +++ b/backends/cloud/onedrive/onedrivestorage.cpp @@ -22,6 +22,7 @@ #define FORBIDDEN_SYMBOL_ALLOW_ALL +#include #include "backends/cloud/onedrive/onedrivestorage.h" #include "backends/cloud/cloudmanager.h" #include "backends/cloud/onedrive/onedrivecreatedirectoryrequest.h" @@ -34,7 +35,6 @@ #include "common/config-manager.h" #include "common/debug.h" #include "common/json.h" -#include #ifdef ENABLE_RELEASE #include "dists/clouds/cloud_keys.h" diff --git a/backends/cloud/onedrive/onedrivetokenrefresher.cpp b/backends/cloud/onedrive/onedrivetokenrefresher.cpp index 7104dc6bb6..be6de40258 100644 --- a/backends/cloud/onedrive/onedrivetokenrefresher.cpp +++ b/backends/cloud/onedrive/onedrivetokenrefresher.cpp @@ -22,12 +22,12 @@ #define FORBIDDEN_SYMBOL_ALLOW_ALL +#include #include "backends/cloud/onedrive/onedrivetokenrefresher.h" #include "backends/cloud/onedrive/onedrivestorage.h" #include "backends/networking/curl/networkreadstream.h" #include "common/debug.h" #include "common/json.h" -#include namespace Cloud { namespace OneDrive { -- cgit v1.2.3