From 77f19defe9c886b0ce3bdf5bdef19e60290f96c3 Mon Sep 17 00:00:00 2001
From: Amos Jeffries <amosjeffries@squid-cache.org>
Date: Wed, 29 May 2024 01:36:28 +1200
Subject: [PATCH 1/2] MinGW: Fix error: cannot convert 'const int*' to 'const
 char*'

---
 src/comm/Tcp.cc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/comm/Tcp.cc b/src/comm/Tcp.cc
index 43c5da0d9ef..3efa845198e 100644
--- a/src/comm/Tcp.cc
+++ b/src/comm/Tcp.cc
@@ -30,7 +30,12 @@ SetSocketOption(const int fd, const int level, const int optName, const Option &
 {
     static_assert(std::is_trivially_copyable<Option>::value, "setsockopt() expects POD-like options");
     static_assert(!std::is_same<Option, bool>::value, "setsockopt() uses int to represent boolean options");
-    if (setsockopt(fd, level, optName, &optValue, sizeof(optValue)) < 0) {
+#if _SQUID_MINGW_
+    const auto *value = reinterpret_cast<const char *>(&optValue);
+#else
+    const auto *value = &optValue;
+#endif
+    if (setsockopt(fd, level, optName, value, sizeof(optValue)) < 0) {
         const auto xerrno = errno;
         debugs(5, DBG_IMPORTANT, "ERROR: setsockopt(2) failure: " << xstrerr(xerrno));
         // TODO: Generalize to throw on errors when some callers need that.

From 18959343d80caa526b3ac4346abc778b6a7c42e0 Mon Sep 17 00:00:00 2001
From: Amos Jeffries <yadij@users.noreply.github.com>
Date: Wed, 29 May 2024 18:05:05 +1200
Subject: [PATCH 2/2] Update src/comm/Tcp.cc

Co-authored-by: Alex Rousskov <rousskov@measurement-factory.com>
---
 src/comm/Tcp.cc | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/comm/Tcp.cc b/src/comm/Tcp.cc
index 3efa845198e..c847cfbc603 100644
--- a/src/comm/Tcp.cc
+++ b/src/comm/Tcp.cc
@@ -30,12 +30,7 @@ SetSocketOption(const int fd, const int level, const int optName, const Option &
 {
     static_assert(std::is_trivially_copyable<Option>::value, "setsockopt() expects POD-like options");
     static_assert(!std::is_same<Option, bool>::value, "setsockopt() uses int to represent boolean options");
-#if _SQUID_MINGW_
-    const auto *value = reinterpret_cast<const char *>(&optValue);
-#else
-    const auto *value = &optValue;
-#endif
-    if (setsockopt(fd, level, optName, value, sizeof(optValue)) < 0) {
+    if (setsockopt(fd, level, optName, reinterpret_cast<const char *>(&optValue), sizeof(optValue)) < 0) {
         const auto xerrno = errno;
         debugs(5, DBG_IMPORTANT, "ERROR: setsockopt(2) failure: " << xstrerr(xerrno));
         // TODO: Generalize to throw on errors when some callers need that.