From: Evan Hunt <each@isc.org>
Date: Mon, 29 Dec 2014 19:16:29 +0000 (-0800)
Subject: [v9_10] corrections for win32/win64 builds
X-Git-Tag: v9.10.2b1~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9cad382ec7681cbfed08717bb985a05f93e92fa8;p=thirdparty%2Fbind9.git

[v9_10] corrections for win32/win64 builds
---

diff --git a/config.h.win32 b/config.h.win32
index 73a64ca45fb..bcd7fdd8d29 100644
--- a/config.h.win32
+++ b/config.h.win32
@@ -314,6 +314,9 @@ typedef __int64 off_t;
 /* Define to the flags type used by getnameinfo(3). */
 #define IRS_GETNAMEINFO_FLAGS_T int
 
+/* Define to the sockaddr length type used by getnameinfo(3). */
+#define IRS_GETNAMEINFO_SOCKLEN_T socklen_t
+
 /* Define to enable the "filter-aaaa-on-v4" and "filter-aaaa-on-v6" options.
    */
 @ALLOW_FILTER_AAAA@
diff --git a/lib/dns/win32/libdns.def.in b/lib/dns/win32/libdns.def.in
index 9744a3cc1cb..cb88b2e8a93 100644
--- a/lib/dns/win32/libdns.def.in
+++ b/lib/dns/win32/libdns.def.in
@@ -57,7 +57,6 @@ dns_adb_noedns
 dns_adb_plainresponse
 dns_adb_probesize
 dns_adb_probesize2
-dns_adb_probesize512
 dns_adb_setadbsize
 dns_adb_setudpsize
 dns_adb_setsit
diff --git a/lib/isc/win32/libisc.def.in b/lib/isc/win32/libisc.def.in
index 6a43c7303fa..9d83b8f47bd 100644
--- a/lib/isc/win32/libisc.def.in
+++ b/lib/isc/win32/libisc.def.in
@@ -480,9 +480,11 @@ isc_portset_isset
 isc_portset_nports
 isc_portset_remove
 isc_portset_removerange
+@IF UNIXONLY
 isc_print_snprintf
 isc_print_sprintf
 isc_print_vsnprintf
+@END UNIXONLY
 isc_quota_attach
 isc_quota_destroy
 isc_quota_detach
@@ -575,7 +577,7 @@ isc_sockaddr_pf
 isc_sockaddr_setport
 isc_sockaddr_totext
 isc_sockaddr_v6fromin
-isc_socket_accept
+@IF UNIXONLY
 isc_socket_attach
 isc_socket_bind
 isc_socket_cancel
@@ -611,6 +613,7 @@ isc_socketmgr_create
 isc_socketmgr_create2
 isc_socketmgr_createinctx
 isc_socketmgr_destroy
+@END UNIXONLY
 @IF LIBXML2
 isc_socketmgr_renderxml
 @END LIBXML2