diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2019-02-12 17:25:20 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2019-03-07 12:46:31 +0100 |
| commit | 5a4af0d4ee6084fdfde0125c45181fa0e6f48a17 (patch) | |
| tree | 7b5039324a6772b9e425a2bf6e37fcffd2be1979 | |
| parent | d890344166449c2c4cc039f19af61600920cd697 (diff) | |
| download | qemu-5a4af0d4ee6084fdfde0125c45181fa0e6f48a17.zip qemu-5a4af0d4ee6084fdfde0125c45181fa0e6f48a17.tar.gz qemu-5a4af0d4ee6084fdfde0125c45181fa0e6f48a17.tar.bz2 | |
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>
| -rw-r--r-- | slirp/Makefile.objs | 2 | ||||
| -rw-r--r-- | slirp/util.c | 4 | ||||
| -rw-r--r-- | slirp/util.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/slirp/Makefile.objs b/slirp/Makefile.objs index 69e140f..e91daf0 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\" diff --git a/slirp/util.c b/slirp/util.c index 1cbaa26..5ec2fa8 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/util.h b/slirp/util.h index c4207a4..e94ee4e 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) |