diff options
| author | SupSuper | 2018-12-16 23:02:06 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2018-12-17 12:28:33 +0200 |
| commit | 272d4105b274391427f92b25b80cbfe68c7997db (patch) | |
| tree | c61d43563b59f4e68f914b02fc7f9391b7133c6d /backends/cloud/box | |
| parent | d0512db25ce5bbd8f31151c3d2374f344f77f006 (diff) | |
| download | scummvm-rg350-272d4105b274391427f92b25b80cbfe68c7997db.tar.gz scummvm-rg350-272d4105b274391427f92b25b80cbfe68c7997db.tar.bz2 scummvm-rg350-272d4105b274391427f92b25b80cbfe68c7997db.zip | |
WIN32: Fix libcurl redefining ARRAYSIZE
libcurl pulls in Windows headers, so let's include it first to avoid clashing with common headers
Diffstat (limited to 'backends/cloud/box')
| -rw-r--r-- | backends/cloud/box/boxstorage.cpp | 2 | ||||
| -rw-r--r-- | backends/cloud/box/boxtokenrefresher.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
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 <curl/curl.h> #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 <curl/curl.h> #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 <curl/curl.h> #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 <curl/curl.h> namespace Cloud { namespace Box { |