From: Mark Andrews <marka@isc.org>
Date: Wed, 4 Oct 2017 06:50:01 +0000 (+1100)
Subject: #undef inet_ntop
X-Git-Tag: v9.12.0b1~98
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=396125eefe2ec4eda1463a5923e27b759632ce70;p=thirdparty%2Fbind9.git

#undef inet_ntop
---

diff --git a/lib/isc/unix/include/isc/net.h b/lib/isc/unix/include/isc/net.h
index 7bf6b089dcb..812a94349dd 100644
--- a/lib/isc/unix/include/isc/net.h
+++ b/lib/isc/unix/include/isc/net.h
@@ -387,6 +387,7 @@ isc_net_getudpportrange(int af, in_port_t *low, in_port_t *high);
 #ifdef ISC_PLATFORM_NEEDNTOP
 const char *
 isc_net_ntop(int af, const void *src, char *dst, size_t size);
+#undef inet_ntop
 #define inet_ntop isc_net_ntop
 #endif
 
diff --git a/lib/isc/win32/include/isc/net.h b/lib/isc/win32/include/isc/net.h
index ef69ad32d5b..1d67c29eed9 100644
--- a/lib/isc/win32/include/isc/net.h
+++ b/lib/isc/win32/include/isc/net.h
@@ -393,6 +393,7 @@ isc_net_getudpportrange(int af, in_port_t *low, in_port_t *high);
 #ifdef ISC_PLATFORM_NEEDNTOP
 const char *
 isc_net_ntop(int af, const void *src, char *dst, size_t size);
+#undef inet_ntop
 #define inet_ntop isc_net_ntop
 #endif