thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WIN32: Fix libcurl redefining ARRAYSIZE

Browse source 
libcurl pulls in Windows headers, so let's include it first to avoid clashing with common headers
This commit is contained in:
SupSuper 2018-12-16 23:02:06 +00:00 • committed by Filippos Karapetis
parent d0512db25c
commit 272d4105b2
11 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backends/cloud/box/boxstorage.cpp
View file

@ -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"

2
backends/cloud/box/boxtokenrefresher.cpp
View file

@ -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 {

2
backends/cloud/dropbox/dropboxstorage.cpp
View file

@ -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"

2
backends/cloud/googledrive/googledrivestorage.cpp
View file

@ -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"

2
backends/cloud/googledrive/googledrivetokenrefresher.cpp
View file

@ -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 {

2
backends/cloud/onedrive/onedrivestorage.cpp
View file

@ -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"

2
backends/cloud/onedrive/onedrivetokenrefresher.cpp
View file

@ -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 {

2
backends/networking/curl/connectionmanager.cpp
View file

@ -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 {

2
backends/networking/curl/curljsonrequest.cpp
View file

@ -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 {

2
backends/networking/curl/curlrequest.cpp
View file

@ -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 {

2
backends/networking/curl/networkreadstream.cpp
View file

@ -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 {