From 272d4105b274391427f92b25b80cbfe68c7997db Mon Sep 17 00:00:00 2001 From: SupSuper Date: Sun, 16 Dec 2018 23:02:06 +0000 Subject: [PATCH] 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 +- backends/networking/curl/connectionmanager.cpp | 2 +- backends/networking/curl/curljsonrequest.cpp | 2 +- backends/networking/curl/curlrequest.cpp | 2 +- backends/networking/curl/networkreadstream.cpp | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/backends/cloud/box/boxstorage.cpp b/backends/cloud/box/boxstorage.cpp index fb01521016d..2671a77a5e7 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 b5008ef8907..5f7ad1d6110 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 c2ca55c083a..b856c6cb2ca 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 c00d9549669..4a870c01b6e 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 a8d9d55bad4..a32a7fcbed7 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 14e803d980e..9f7cad2e01f 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 7104dc6bb62..be6de402581 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 { diff --git a/backends/networking/curl/connectionmanager.cpp b/backends/networking/curl/connectionmanager.cpp index d8662ab78d4..7698ddad144 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 7764e119504..15fabf9007e 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 7ee8d66c662..a9de30cfe97 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 20488401dd4..ac8800b22a4 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 {