[v9_10] corrections for win32/win64 builds

diff --git a/config.h.win32 b/config.h.win32
index 73a64ca45fbbe571f6387cc4dad9da7046739d58..bcd7fdd8d292675939e566fc1eddb728f75eac27 100644 (file)
--- 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 9744a3cc1cbbf5699fe49971964750e7f9a9e90b..cb88b2e8a93789f7f06a1091c6642a8858d14e64 100644 (file)
--- 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 6a43c7303fa830d260addcff312ea05ac33b1d10..9d83b8f47bdd428c7ac0ece8c6dafb7c78c47d62 100644 (file)
--- 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