[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/7] slirp: use "slirp_" prefix for inet_aton() win3
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH 3/7] slirp: use "slirp_" prefix for inet_aton() win32 implementation |
Date: |
Tue, 12 Feb 2019 17:25:20 +0100 |
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 <address@hidden>
---
slirp/util.h | 4 ++--
slirp/util.c | 4 ++--
slirp/Makefile.objs | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/slirp/util.h b/slirp/util.h
index c4207a49d6..e94ee4e7f1 100644
--- a/slirp/util.h
+++ b/slirp/util.h
@@ -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)
diff --git a/slirp/util.c b/slirp/util.c
index 1cbaa26b60..5ec2fa87ab 100644
--- a/slirp/util.c
+++ b/slirp/util.c
@@ -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) {
diff --git a/slirp/Makefile.objs b/slirp/Makefile.objs
index 69e140f965..e91daf0e91 100644
--- a/slirp/Makefile.objs
+++ b/slirp/Makefile.objs
@@ -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\"
--
2.21.0.rc0.1.g036caf7885
- [Qemu-devel] [PATCH 0/7] slirp: make it a standalone project, Marc-André Lureau, 2019/02/12
- [Qemu-devel] [PATCH 4/7] slirp: move sources to src/ subdirectory, Marc-André Lureau, 2019/02/12
- [Qemu-devel] [PATCH 1/7] slirp: adapt a subset of QEMU vmstate code, Marc-André Lureau, 2019/02/12
- [Qemu-devel] [PATCH 7/7] slirp: remove QEMU Makefile.objs, Marc-André Lureau, 2019/02/12
- [Qemu-devel] [PATCH 2/7] slirp: use libslirp migration code, Marc-André Lureau, 2019/02/12
- [Qemu-devel] [PATCH 3/7] slirp: use "slirp_" prefix for inet_aton() win32 implementation,
Marc-André Lureau <=
- [Qemu-devel] [PATCH 6/7] build-sys: link with slirp as an external project, Marc-André Lureau, 2019/02/12
- [Qemu-devel] [PATCH 5/7] slirp: add a standalone Makefile, Marc-André Lureau, 2019/02/12