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 | |
| 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
| -rw-r--r-- | backends/cloud/box/boxstorage.cpp | 2 | ||||
| -rw-r--r-- | backends/cloud/box/boxtokenrefresher.cpp | 2 | ||||
| -rw-r--r-- | backends/cloud/dropbox/dropboxstorage.cpp | 2 | ||||
| -rw-r--r-- | backends/cloud/googledrive/googledrivestorage.cpp | 2 | ||||
| -rw-r--r-- | backends/cloud/googledrive/googledrivetokenrefresher.cpp | 2 | ||||
| -rw-r--r-- | backends/cloud/onedrive/onedrivestorage.cpp | 2 | ||||
| -rw-r--r-- | backends/cloud/onedrive/onedrivetokenrefresher.cpp | 2 | ||||
| -rw-r--r-- | backends/networking/curl/connectionmanager.cpp | 2 | ||||
| -rw-r--r-- | backends/networking/curl/curljsonrequest.cpp | 2 | ||||
| -rw-r--r-- | backends/networking/curl/curlrequest.cpp | 2 | ||||
| -rw-r--r-- | 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 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 { 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 <curl/curl.h> #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 <curl/curl.h> #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 <curl/curl.h> #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 <curl/curl.h> #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 <curl/curl.h> #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 <curl/curl.h> 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 <curl/curl.h> #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 <curl/curl.h> #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 <curl/curl.h> #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 <curl/curl.h> namespace Cloud { namespace OneDrive { diff --git a/backends/networking/curl/connectionmanager.cpp b/backends/networking/curl/connectionmanager.cpp index d8662ab78d..7698ddad14 100644 --- a/backends/networking/curl/connectionmanager.cpp +++ b/backends/networking/curl/connectionmanager.cpp @@ -22,12 +22,12 @@ #define FORBIDDEN_SYMBOL_ALLOW_ALL +#include <curl/curl.h> #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 <curl/curl.h> namespace Common { diff --git a/backends/networking/curl/curljsonrequest.cpp b/backends/networking/curl/curljsonrequest.cpp index 7764e11950..15fabf9007 100644 --- a/backends/networking/curl/curljsonrequest.cpp +++ b/backends/networking/curl/curljsonrequest.cpp @@ -22,12 +22,12 @@ #define FORBIDDEN_SYMBOL_ALLOW_ALL +#include <curl/curl.h> #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 <curl/curl.h> namespace Networking { diff --git a/backends/networking/curl/curlrequest.cpp b/backends/networking/curl/curlrequest.cpp index 7ee8d66c66..a9de30cfe9 100644 --- a/backends/networking/curl/curlrequest.cpp +++ b/backends/networking/curl/curlrequest.cpp @@ -22,11 +22,11 @@ #define FORBIDDEN_SYMBOL_ALLOW_ALL +#include <curl/curl.h> #include "backends/networking/curl/curlrequest.h" #include "backends/networking/curl/connectionmanager.h" #include "backends/networking/curl/networkreadstream.h" #include "common/textconsole.h" -#include <curl/curl.h> namespace Networking { diff --git a/backends/networking/curl/networkreadstream.cpp b/backends/networking/curl/networkreadstream.cpp index 20488401dd..ac8800b22a 100644 --- a/backends/networking/curl/networkreadstream.cpp +++ b/backends/networking/curl/networkreadstream.cpp @@ -22,10 +22,10 @@ #define FORBIDDEN_SYMBOL_ALLOW_ALL +#include <curl/curl.h> #include "backends/networking/curl/networkreadstream.h" #include "backends/networking/curl/connectionmanager.h" #include "base/version.h" -#include <curl/curl.h> namespace Networking { |