Commit 5a4af0d4 authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Samuel Thibault
Browse files

slirp: use "slirp_" prefix for inet_aton() win32 implementation 



To avoid conflict with QEMU inet_aton() implementation, let's use the
"slirp_" prefix. This allows to drop the WITH_QEMU, thus the source
won't make a distinction when building with QEMU or not.

Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20190212162524.31504-4-marcandre.lureau@redhat.com>
Signed-off-by: default avatarSamuel Thibault <samuel.thibault@ens-lyon.org>
parent d8903441

slirp/Makefile.objs

+1 −1
Original line number Diff line number Diff line
@@ -33,4 +33,4 @@ slirp.mo-objs = \ 
	vmstate.o \

	$(NULL)



slirp.mo-cflags = -DG_LOG_DOMAIN=\"Slirp\" -DWITH_QEMU
 
slirp.mo-cflags = -DG_LOG_DOMAIN=\"Slirp\"

slirp/util.c

+2 −2
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ 
#include <fcntl.h>

#include <stdint.h>



#if defined(_WIN32) && !defined(WITH_QEMU)

int inet_aton(const char *cp, struct in_addr *ia)

#if defined(_WIN32)

int slirp_inet_aton(const char *cp, struct in_addr *ia)

{

    uint32_t addr = inet_addr(cp);

    if (addr == 0xffffffff) {

slirp/util.h

+2 −2
Original line number Diff line number Diff line
@@ -138,8 +138,8 @@ int slirp_getsockopt_wrap(int sockfd, int level, int optname, 
#define setsockopt slirp_setsockopt_wrap

int slirp_setsockopt_wrap(int sockfd, int level, int optname,

                          const void *optval, int optlen);



int inet_aton(const char *cp, struct in_addr *ia);

#define inet_aton slirp_inet_aton

int slirp_inet_aton(const char *cp, struct in_addr *ia);

#else

#define closesocket(s) close(s)

#define ioctlsocket(s, r, v) ioctl(s, r, v)