[Scummvm-git-logs] scummvm master -> ae2b3181f34f7424c8a9dbd090113623eda790d2

[dwatteau]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
ae2b3181f3 BACKENDS: CURL: Fix libcurl redefining ARRAYSIZE on Win32


Commit: ae2b3181f34f7424c8a9dbd090113623eda790d2
    https://github.com/scummvm/scummvm/commit/ae2b3181f34f7424c8a9dbd090113623eda790d2
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2023-03-09T14:52:58+01:00

Commit Message:
BACKENDS: CURL: Fix libcurl redefining ARRAYSIZE on Win32

As done in commit 272d4105b274391427f92b25b80cbfe68c7997db.

Changed paths:
    backends/networking/curl/socket.cpp
    backends/networking/curl/url.cpp


diff --git a/backends/networking/curl/socket.cpp b/backends/networking/curl/socket.cpp
index 2ed94b6271b..e3da5568bc5 100644
--- a/backends/networking/curl/socket.cpp
+++ b/backends/networking/curl/socket.cpp
@@ -20,10 +20,10 @@
  */
 
 #define FORBIDDEN_SYMBOL_ALLOW_ALL
+#include <curl/curl.h>
 #include "backends/networking/curl/socket.h"
 #include "common/debug.h"
 #include "common/system.h"
-#include <curl/curl.h>
 
 // Auxiliary function that waits on the socket.
 // From https://github.com/curl/curl/blob/master/docs/examples/sendrecv.c
@@ -115,8 +115,9 @@ bool CurlSocket::connect(Common::String url) {
 size_t CurlSocket::send(const char *data, int len) {
 	if (!_socket)
 		return -1;
-    size_t nsent_total = 0, left = len;
-    CURLcode res = CURLE_AGAIN;
+
+	size_t nsent_total = 0, left = len;
+	CURLcode res = CURLE_AGAIN;
 
 	// Keep looping until the whole thing is sent, errors,
 	// or times out.
diff --git a/backends/networking/curl/url.cpp b/backends/networking/curl/url.cpp
index 2e577a8480d..47381948640 100644
--- a/backends/networking/curl/url.cpp
+++ b/backends/networking/curl/url.cpp
@@ -20,9 +20,9 @@
  */
 
 #define FORBIDDEN_SYMBOL_ALLOW_ALL
+#include <curl/curl.h>
 #include "backends/networking/curl/url.h"
 #include "common/debug.h"
-#include <curl/curl.h>
 
 namespace Networking {