80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Correct tinyglib data type size macros, fixes SLiRP on x64

Browse Source
This commit is contained in:
RichardG867
2020-12-13 13:28:31 -03:00
parent c6895ccad6
commit 3a07d4d5b2
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/include/tinyglib.h
View File

@@ -58,16 +58,17 @@
#define G_SPAWN_SEARCH_PATH 0 #define G_SPAWN_SEARCH_PATH 0
#if defined(__LP64__) || defined(__LLP64__) #if defined(__LP64__) || defined(__LLP64__) || defined(_WIN64)
# define GLIB_SIZEOF_VOID_P 8 # define GLIB_SIZEOF_VOID_P 8
#else # if defined(__LLP64__) || defined(_WIN64)
# define GLIB_SIZEOF_VOID_P 4 # define GLIB_SIZEOF_LONG 4
#endif # else
#ifdef __LP64__ # define GLIB_SIZEOF_LONG 8
# define GLIB_SIZEOF_LONG 8 # endif
# define GLIB_SIZEOF_SIZE_T 8 # define GLIB_SIZEOF_SIZE_T 8
# define GLIB_SIZEOF_SSIZE_T 8 # define GLIB_SIZEOF_SSIZE_T 8
#else #else
# define GLIB_SIZEOF_VOID_P 4
# define GLIB_SIZEOF_LONG 4 # define GLIB_SIZEOF_LONG 4
# define GLIB_SIZEOF_SIZE_T 4 # define GLIB_SIZEOF_SIZE_T 4
# define GLIB_SIZEOF_SSIZE_T 4 # define GLIB_SIZEOF_SSIZE_T 4

2
src/network/net_slirp.c
View File

@@ -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) net_slirp_send_packet(const void *qp, size_t pkt_len, void *opaque)
{ {
slirp_t *slirp = (slirp_t *) opaque; slirp_t *slirp = (slirp_t *) opaque;