From cf7ad9758dd7927595cb9751ba8173e06fc33cad Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Sun, 17 Feb 2013 17:13:39 +0100 Subject: ares_inet_pton/ntop: cleanup Make sure that the symbols are always exported and present in c-ares. Make the headers prefixed with 'ares'. Removed the inet_ntop.h version as it no longer features any content. --- inet_ntop.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'inet_ntop.c') diff --git a/inet_ntop.c b/inet_ntop.c index ea1ebb8..77fe4a6 100644 --- a/inet_ntop.c +++ b/inet_ntop.c @@ -34,8 +34,6 @@ #include "ares.h" #include "ares_ipv6.h" -#include "inet_ntop.h" - #ifndef HAVE_INET_NTOP @@ -61,7 +59,7 @@ static const char *inet_ntop6(const unsigned char *src, char *dst, size_t size); * Paul Vixie, 1996. */ const char * -ares_inet_ntop(int af, const void *src, char *dst, size_t size) +ares_inet_ntop(int af, const void *src, char *dst, socklen_t size) { switch (af) { case AF_INET: @@ -197,4 +195,11 @@ inet_ntop6(const unsigned char *src, char *dst, size_t size) strcpy(dst, tmp); return (dst); } -#endif +#else /* HAVE_INET_NTOP */ + +const char *ares_inet_ntop(int af, const void *src, char *dst, socklen_t size) +{ + /* just relay this to the underlying function */ + return inet_ntop(af, src, dst, size); +} +#endif /* HAVE_INET_NTOP */ -- cgit v1.2.3