From 04f8b91701383c3fd866625133e98d30188ed9d5 Mon Sep 17 00:00:00 2001
From: Volker Ruppert <Volker.Ruppert@t-online.de>
Date: Sat, 30 Nov 2024 13:04:08 +0100
Subject: [PATCH] Fixed 32-bit compilation with VS2022 (issue #400).

---
 bochs/.conf.win32-vcpp                 | 10 ++++++----
 bochs/iodev/network/slirp/dnssearch.cc |  2 +-
 bochs/iodev/network/slirp/slirp.cc     |  2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/bochs/.conf.win32-vcpp b/bochs/.conf.win32-vcpp
index c12c299b8..7028695cb 100755
--- a/bochs/.conf.win32-vcpp
+++ b/bochs/.conf.win32-vcpp
@@ -34,8 +34,10 @@ unset echo
 
 # Fix up all makefiles so that nmake can handle them.
 for i in `find . -name Makefile`; do
-  echo Removing curly brackets in $i for NMAKE.
-  mv $i $i.tmp
-  sed -e 's/{/(/g' -e 's/}/)/g' < $i.tmp > $i
-  rm -f $i.tmp
+  if test "$i" != "./cpu/softfloat3e/Makefile"; then
+    echo Removing curly brackets in $i for NMAKE.
+    mv $i $i.tmp
+    sed -e 's/{/(/g' -e 's/}/)/g' < $i.tmp > $i
+    rm -f $i.tmp
+  fi
 done
diff --git a/bochs/iodev/network/slirp/dnssearch.cc b/bochs/iodev/network/slirp/dnssearch.cc
index 6ce0075e4..e3a839fa7 100644
--- a/bochs/iodev/network/slirp/dnssearch.cc
+++ b/bochs/iodev/network/slirp/dnssearch.cc
@@ -59,7 +59,7 @@ static size_t domain_suffix_diffoff(const CompactDomain *a,
     return i;
 }
 
-static int domain_suffix_ord(const void *cva, const void *cvb)
+static int CDECL domain_suffix_ord(const void *cva, const void *cvb)
 {
     const CompactDomain *a = (const CompactDomain*)cva, *b = (const CompactDomain*)cvb;
     size_t la = a->len, lb = b->len;
diff --git a/bochs/iodev/network/slirp/slirp.cc b/bochs/iodev/network/slirp/slirp.cc
index 2d48c35f2..b7d7aaae6 100644
--- a/bochs/iodev/network/slirp/slirp.cc
+++ b/bochs/iodev/network/slirp/slirp.cc
@@ -249,7 +249,7 @@ int get_dns6_addr(struct in6_addr *pdns6_addr, uint32_t *scope_id)
     return -1;
 }
 
-static void winsock_cleanup(void)
+static void CDECL winsock_cleanup(void)
 {
     WSACleanup();
 }