From 100eaf70ee3ea340b89426b0f0ef2c5fa53864b2 Mon Sep 17 00:00:00 2001
From: Didiet <lynxluna@gmail.com>
Date: Sat, 16 Apr 2022 13:12:38 +0700
Subject: [PATCH] Fixing GdbStub Code to make it compiled with Clang (#2292)

- Fix the switch scoping preventing declaration
- Adding stdint.h as inclusion to make uint*_t works
---
 src/gdbstub.c               | 9 ++++++++-
 src/include/86box/gdbstub.h | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/gdbstub.c b/src/gdbstub.c
index 20103c4cd..7ce2f360f 100644
--- a/src/gdbstub.c
+++ b/src/gdbstub.c
@@ -27,6 +27,7 @@
 #else
 #    include <arpa/inet.h>
 #    include <sys/socket.h>
+#    include <errno.h>
 #endif
 #define HAVE_STDARG_H
 #include <86box/86box.h>
@@ -954,7 +955,7 @@ e14:
                 /* Add our supported features to the end. */
                 if (client->response_pos < (sizeof(client->response) - 1))
                     client->response_pos += snprintf(&client->response[client->response_pos], sizeof(client->response) - client->response_pos,
-                                                     "PacketSize=%X;swbreak+;hwbreak+;qXfer:features:read+", sizeof(client->packet) - 1);
+                                                     "PacketSize=%lX;swbreak+;hwbreak+;qXfer:features:read+", sizeof(client->packet) - 1);
                 break;
             } else if (!strcmp(client->response, "Xfer")) {
                 /* Read the transfer object. */
@@ -1101,6 +1102,7 @@ unknown:
 
         case 'z': /* remove break/watchpoint */
         case 'Z': /* insert break/watchpoint */
+        {
             gdbstub_breakpoint_t *breakpoint, *prev_breakpoint = NULL, **first_breakpoint;
 
             /* Parse breakpoint type. */
@@ -1222,6 +1224,7 @@ unknown:
 
             /* Respond positively. */
             goto ok;
+        }
     }
 end:
     /* Send response. */
@@ -1655,7 +1658,11 @@ gdbstub_init()
         .sin_port   = htons(port)
     };
     if (bind(gdbstub_socket, (struct sockaddr *) &bind_addr, sizeof(bind_addr)) == -1) {
+#ifdef _WIN32
         pclog("GDB Stub: Failed to bind on port %d (%d)\n", port, WSAGetLastError());
+#else 
+        pclog("GDB Stup: Failed to bind on port %d (%d)\n", port, errno);
+#endif
         gdbstub_socket = -1;
         return;
     }
diff --git a/src/include/86box/gdbstub.h b/src/include/86box/gdbstub.h
index 49eed2c45..4b2f8630a 100644
--- a/src/include/86box/gdbstub.h
+++ b/src/include/86box/gdbstub.h
@@ -16,6 +16,7 @@
  */
 #ifndef EMU_GDBSTUB_H
 #define EMU_GDBSTUB_H
+#include <stdint.h>
 #include <86box/mem.h>
 
 #define GDBSTUB_MEM_READ   0