Fixed 32-bit compilation with VS2022 (issue #400).

bochs-emu · Nov 30, 2024 · 04f8b91 · 04f8b91
1 parent 1d7c713
commit 04f8b91
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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();
 }