[Scummvm-git-logs] scummvm master -> 0178c629b24b61b61002d1f041d33a16fb70cddf

[sev-]

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

Summary:
ef5aa5febe NETWORKING: rearrange curl includes to avoid ARRAYSIZE macro redefinition on Windows
f612d85708 JANITORIAL: resolve typo in comment
0178c629b2 JANITORIAL: resolve typo in comment


Commit: ef5aa5febe8cd5a68c2227fdaeee43852c3b1c9a
    https://github.com/scummvm/scummvm/commit/ef5aa5febe8cd5a68c2227fdaeee43852c3b1c9a
Author: Michael (michael_kuerbis at web.de)
Date: 2026-02-25T10:19:37+01:00

Commit Message:
NETWORKING: rearrange curl includes to avoid ARRAYSIZE macro redefinition on Windows

Changed paths:
    backends/networking/http/curl/connectionmanager-curl.cpp
    backends/networking/http/curl/connectionmanager-curl.h
    backends/networking/http/curl/networkreadstream-curl.cpp


diff --git a/backends/networking/http/curl/connectionmanager-curl.cpp b/backends/networking/http/curl/connectionmanager-curl.cpp
index 6c2e3c294ba..9df339d7903 100644
--- a/backends/networking/http/curl/connectionmanager-curl.cpp
+++ b/backends/networking/http/curl/connectionmanager-curl.cpp
@@ -19,8 +19,13 @@
  *
  */
 
-#include "backends/networking/http/curl/connectionmanager-curl.h"
+// Include order specifically chosen to avoid ARRAYSIZE macro redefiniion on Windows
+
+#include <curl/curl.h>
+
 #include "backends/networking/http/curl/networkreadstream-curl.h"
+#include "backends/networking/http/curl/connectionmanager-curl.h"
+
 #include "common/debug.h"
 #include "common/system.h"
 #include "common/timer.h"
diff --git a/backends/networking/http/curl/connectionmanager-curl.h b/backends/networking/http/curl/connectionmanager-curl.h
index 4452858819d..76e4644e7b3 100644
--- a/backends/networking/http/curl/connectionmanager-curl.h
+++ b/backends/networking/http/curl/connectionmanager-curl.h
@@ -28,6 +28,12 @@
 
 #include <curl/curl.h>
 
+// curl headers include Windows headers
+// which may define the ARRAYSIZE macro,
+// therefore include common/util.h to replace it
+// with the ScummVM definition as early as possible
+#include "common/util.h"
+
 namespace Networking {
 
 class ConnectionManagerCurl : public ConnectionManager {
diff --git a/backends/networking/http/curl/networkreadstream-curl.cpp b/backends/networking/http/curl/networkreadstream-curl.cpp
index f8c77f9ee9b..8582fcf50ab 100644
--- a/backends/networking/http/curl/networkreadstream-curl.cpp
+++ b/backends/networking/http/curl/networkreadstream-curl.cpp
@@ -22,9 +22,13 @@
 #define FORBIDDEN_SYMBOL_ALLOW_ALL
 #define CURL_DISABLE_DEPRECATION
 
-#include "backends/networking/basic/curl/cacert.h"
+// Include order specifically chosen to avoid ARRAYSIZE macro redefiniion on Windows
+
+#include <curl/curl.h>
+
 #include "backends/networking/http/curl/networkreadstream-curl.h"
 #include "backends/networking/http/curl/connectionmanager-curl.h"
+#include "backends/networking/basic/curl/cacert.h"
 #include "base/version.h"
 #include "common/debug.h"
 


Commit: f612d85708479d1e488c973a2504e3e7201a5326
    https://github.com/scummvm/scummvm/commit/f612d85708479d1e488c973a2504e3e7201a5326
Author: Michael (michael_kuerbis at web.de)
Date: 2026-02-25T10:19:37+01:00

Commit Message:
JANITORIAL: resolve typo in comment

Changed paths:
    backends/networking/http/curl/connectionmanager-curl.cpp


diff --git a/backends/networking/http/curl/connectionmanager-curl.cpp b/backends/networking/http/curl/connectionmanager-curl.cpp
index 9df339d7903..f8d3f45bf51 100644
--- a/backends/networking/http/curl/connectionmanager-curl.cpp
+++ b/backends/networking/http/curl/connectionmanager-curl.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-// Include order specifically chosen to avoid ARRAYSIZE macro redefiniion on Windows
+// Include order specifically chosen to avoid ARRAYSIZE macro redefinition on Windows
 
 #include <curl/curl.h>
 


Commit: 0178c629b24b61b61002d1f041d33a16fb70cddf
    https://github.com/scummvm/scummvm/commit/0178c629b24b61b61002d1f041d33a16fb70cddf
Author: Michael (michael_kuerbis at web.de)
Date: 2026-02-25T10:19:37+01:00

Commit Message:
JANITORIAL: resolve typo in comment

Changed paths:
    backends/networking/http/curl/networkreadstream-curl.cpp


diff --git a/backends/networking/http/curl/networkreadstream-curl.cpp b/backends/networking/http/curl/networkreadstream-curl.cpp
index 8582fcf50ab..75e66289c48 100644
--- a/backends/networking/http/curl/networkreadstream-curl.cpp
+++ b/backends/networking/http/curl/networkreadstream-curl.cpp
@@ -22,7 +22,7 @@
 #define FORBIDDEN_SYMBOL_ALLOW_ALL
 #define CURL_DISABLE_DEPRECATION
 
-// Include order specifically chosen to avoid ARRAYSIZE macro redefiniion on Windows
+// Include order specifically chosen to avoid ARRAYSIZE macro redefinition on Windows
 
 #include <curl/curl.h>