mirror of https://gitlab.com/qemu-project/qemu
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: Marc-André Lureau <marcandre.lureau@redhat.com> Message-Id: <20190212162524.31504-4-marcandre.lureau@redhat.com> Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
This commit is contained in:
parent
d890344166
commit
5a4af0d4ee
|
@ -33,4 +33,4 @@ slirp.mo-objs = \
|
||||||
vmstate.o \
|
vmstate.o \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
slirp.mo-cflags = -DG_LOG_DOMAIN=\"Slirp\" -DWITH_QEMU
|
slirp.mo-cflags = -DG_LOG_DOMAIN=\"Slirp\"
|
||||||
|
|
|
@ -31,8 +31,8 @@
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|
||||||
#if defined(_WIN32) && !defined(WITH_QEMU)
|
#if defined(_WIN32)
|
||||||
int inet_aton(const char *cp, struct in_addr *ia)
|
int slirp_inet_aton(const char *cp, struct in_addr *ia)
|
||||||
{
|
{
|
||||||
uint32_t addr = inet_addr(cp);
|
uint32_t addr = inet_addr(cp);
|
||||||
if (addr == 0xffffffff) {
|
if (addr == 0xffffffff) {
|
||||||
|
|
|
@ -138,8 +138,8 @@ int slirp_getsockopt_wrap(int sockfd, int level, int optname,
|
||||||
#define setsockopt slirp_setsockopt_wrap
|
#define setsockopt slirp_setsockopt_wrap
|
||||||
int slirp_setsockopt_wrap(int sockfd, int level, int optname,
|
int slirp_setsockopt_wrap(int sockfd, int level, int optname,
|
||||||
const void *optval, int optlen);
|
const void *optval, int optlen);
|
||||||
|
#define inet_aton slirp_inet_aton
|
||||||
int inet_aton(const char *cp, struct in_addr *ia);
|
int slirp_inet_aton(const char *cp, struct in_addr *ia);
|
||||||
#else
|
#else
|
||||||
#define closesocket(s) close(s)
|
#define closesocket(s) close(s)
|
||||||
#define ioctlsocket(s, r, v) ioctl(s, r, v)
|
#define ioctlsocket(s, r, v) ioctl(s, r, v)
|
||||||
|
|
Loading…
Reference in New Issue