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/box/boxstorage.cpp | 2 +- backends/cloud/box/boxtokenrefresher.cpp | 2 +- backends/cloud/dropbox/dropboxstorage.cpp | 2 +- backends/cloud/googledrive/googledrivestorage.cpp | 2 +- backends/cloud/googledrive/googledrivetokenrefresher.cpp | 2 +- backends/cloud/onedrive/onedrivestorage.cpp | 2 +- backends/cloud/onedrive/onedrivetokenrefresher.cpp | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'backends/cloud') diff --git a/backends/cloud/box/boxstorage.cpp b/backends/cloud/box/boxstorage.cpp index fb01521016..2671a77a5e 100644 --- a/backends/cloud/box/boxstorage.cpp +++ b/backends/cloud/box/boxstorage.cpp @@ -22,6 +22,7 @@ #define FORBIDDEN_SYMBOL_ALLOW_ALL +#include #include "backends/cloud/box/boxstorage.h" #include "backends/cloud/box/boxlistdirectorybyidrequest.h" #include "backends/cloud/box/boxtokenrefresher.h" @@ -33,7 +34,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/box/boxtokenrefresher.cpp b/backends/cloud/box/boxtokenrefresher.cpp index b5008ef890..5f7ad1d611 100644 --- a/backends/cloud/box/boxtokenrefresher.cpp +++ b/backends/cloud/box/boxtokenrefresher.cpp @@ -22,12 +22,12 @@ #define FORBIDDEN_SYMBOL_ALLOW_ALL +#include #include "backends/cloud/box/boxtokenrefresher.h" #include "backends/cloud/box/boxstorage.h" #include "backends/networking/curl/networkreadstream.h" #include "common/debug.h" #include "common/json.h" -#include namespace Cloud { namespace Box { diff --git a/backends/cloud/dropbox/dropboxstorage.cpp b/backends/cloud/dropbox/dropboxstorage.cpp index c2ca55c083..b856c6cb2c 100644 --- a/backends/cloud/dropbox/dropboxstorage.cpp +++ b/backends/cloud/dropbox/dropboxstorage.cpp @@ -22,6 +22,7 @@ #define FORBIDDEN_SYMBOL_ALLOW_ALL +#include #include "backends/cloud/dropbox/dropboxstorage.h" #include "backends/cloud/dropbox/dropboxcreatedirectoryrequest.h" #include "backends/cloud/dropbox/dropboxinforequest.h" @@ -33,7 +34,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/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 { 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