From 3a07d4d5b2eadb6862b2be9036ed06d6aa80b81a Mon Sep 17 00:00:00 2001
From: RichardG867 <richardg867@gmail.com>
Date: Sun, 13 Dec 2020 13:28:31 -0300
Subject: [PATCH] Correct tinyglib data type size macros, fixes SLiRP on x64

---
 src/include/tinyglib.h  | 13 +++++++------
 src/network/net_slirp.c |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/include/tinyglib.h b/src/include/tinyglib.h
index 01bb08cf7..e510cbc85 100644
--- a/src/include/tinyglib.h
+++ b/src/include/tinyglib.h
@@ -58,16 +58,17 @@
 
 #define G_SPAWN_SEARCH_PATH 0
 
-#if defined(__LP64__) || defined(__LLP64__)
+#if defined(__LP64__) || defined(__LLP64__) || defined(_WIN64)
 # define GLIB_SIZEOF_VOID_P 8
-#else
-# define GLIB_SIZEOF_VOID_P 4
-#endif
-#ifdef __LP64__
-# define GLIB_SIZEOF_LONG 8
+# if defined(__LLP64__) || defined(_WIN64)
+#  define GLIB_SIZEOF_LONG 4
+# else
+#  define GLIB_SIZEOF_LONG 8
+# endif
 # define GLIB_SIZEOF_SIZE_T 8
 # define GLIB_SIZEOF_SSIZE_T 8
 #else
+# define GLIB_SIZEOF_VOID_P 4
 # define GLIB_SIZEOF_LONG 4
 # define GLIB_SIZEOF_SIZE_T 4
 # define GLIB_SIZEOF_SSIZE_T 4
diff --git a/src/network/net_slirp.c b/src/network/net_slirp.c
index 80161b4be..ddfeba6cf 100644
--- a/src/network/net_slirp.c
+++ b/src/network/net_slirp.c
@@ -150,7 +150,7 @@ net_slirp_notify(void *opaque)
 }
 
 
-int
+ssize_t
 net_slirp_send_packet(const void *qp, size_t pkt_len, void *opaque)
 {
     slirp_t *slirp = (slirp_t *) opaque;