Changeset 85195 in vbox for trunk/src/VBox/Devices/Network/slirp

Timestamp:

Jul 10, 2020 3:12:19 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

139168

Message:

slirp: Clang 11 / OSX SDK 10.13 adjustments. bugref:9790

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• bsd/sys/mbuf.h (modified) (1 diff)
• libalias/alias.c (modified) (2 diffs)
• slirp.h (modified) (1 diff)

trunk/src/VBox/Devices/Network/slirp/bsd/sys/mbuf.h

@@ -70 +70 @@
 # endif
 
+# undef  bzero
 # define bzero(a1, len) memset((a1), 0, (len))
 

trunk/src/VBox/Devices/Network/slirp/libalias/alias.c

@@ -150 +150 @@
 # include "alias_mod.h"
 
-#define return(x)                                             \
+# if 0 /* Clang 11 does not approve of this */
+# define return(x)                                            \
 do {                                                          \
     Log2(("NAT:ALIAS: %s:%d return(%s:%d)\n",                 \
@@ -156 +157 @@
     return x;                                                 \
 } while(0)
+# endif
 #endif /* VBOX */
 static __inline int

trunk/src/VBox/Devices/Network/slirp/slirp.h

@@ -410 +410 @@
 # define ip_next(ip) (void *)((uint8_t *)(ip) + ((ip)->ip_hl << 2))
 # define udp_next(udp) (void *)((uint8_t *)&((struct udphdr *)(udp))[1])
+# undef  bcopy
 # define bcopy(src, dst, len) memcpy((dst), (src), (len))
+# undef  bcmp
 # define bcmp(a1, a2, len) memcmp((a1), (a2), (len))
 # define NO_FW_PUNCH