address win32 compile/link problems

diff --git a/lib/dns/win32/libdns.def b/lib/dns/win32/libdns.def
index 443e7b11a8b937e4f103b05a9c79634ff97e65a0..493ed6b2ecfade47285dd3808f2869bc8fc34941 100644 (file)
--- a/lib/dns/win32/libdns.def
+++ b/lib/dns/win32/libdns.def
@@ -175,6 +175,7 @@ dns_dispatch_detach
 dns_dispatch_getlocaladdress
 dns_dispatch_getsocket
 dns_dispatch_getudp
+dns_dispatch_getudp_dup
 dns_dispatch_importrecv
 dns_dispatch_removeresponse
 dns_dispatch_starttcp
@@ -295,6 +296,7 @@ dns_master_loadstreaminc
 dns_master_questiontotext
 dns_master_rdatasettotext
 dns_master_stylecreate
+dns_master_stylecreate2
 dns_master_styledestroy
 dns_message_addname
 dns_message_checksig
@@ -719,6 +721,7 @@ dns_view_flushanddetach
 dns_view_flushcache
 dns_view_flushcache2
 dns_view_flushname
+dns_view_flushnode
 dns_view_freeze
 dns_view_freezezones
 dns_view_getdynamickeyring
@@ -836,6 +839,7 @@ dns_zone_replacedb
 dns_zone_setacache
 dns_zone_setadded
 dns_zone_setalsonotify
+dns_zone_setalsonotifywithkeys
 dns_zone_setaltxfrsource4
 dns_zone_setaltxfrsource6
 dns_zone_setcheckmx
@@ -876,6 +880,7 @@ dns_zone_setorigin
 dns_zone_setprivatetype
 dns_zone_setqueryacl
 dns_zone_setqueryonacl
+dns_zone_setrefreshkeyinterval
 dns_zone_setrequeststats
 dns_zone_setserialupdatemethod
 dns_zone_setsignatures

diff --git a/lib/isc/include/isc/namespace.h b/lib/isc/include/isc/namespace.h
index 0f93ddd60e5d794bfdafd228b2f690a326e26497..c111d2873b04a61d6bedf3094b79ec31be3e44e2 100644 (file)
--- a/lib/isc/include/isc/namespace.h
+++ b/lib/isc/include/isc/namespace.h
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: namespace.h,v 1.11 2011/07/28 23:47:59 tbox Exp $ */
+/* $Id: namespace.h,v 1.12 2011/08/23 17:02:53 each Exp $ */
 
 #ifndef ISCAPI_NAMESPACE_H
 #define ISCAPI_NAMESPACE_H 1
@@ -111,6 +111,7 @@
 #define isc_socket_listen isc__socket_listen
 #define isc_socket_accept isc__socket_accept
 #define isc_socket_connect isc__socket_connect
+#define isc_socket_getfd isc__socket_getfd
 #define isc_socket_getname isc__socket_getname
 #define isc_socket_gettag isc__socket_gettag
 #define isc_socket_getpeername isc__socket_getpeername

diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index 458387fe1444b6bafd959c1ebbf2d1873f761b78..2ae0bce77b30094f6fda9a666015c6ca1b3c176d 100644 (file)
--- a/lib/isc/unix/socket.c
+++ b/lib/isc/unix/socket.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: socket.c,v 1.344 2011/07/28 23:47:59 tbox Exp $ */
+/* $Id: socket.c,v 1.345 2011/08/23 17:02:53 each Exp $ */
 
 /*! \file */
 
@@ -5879,8 +5879,8 @@ isc__socket_register() {
 }
 #endif
 
-int
-isc_socket_getfd(isc_socket_t *socket0) {
+ISC_SOCKETFUNC_SCOPE int
+isc__socket_getfd(isc_socket_t *socket0) {
        isc__socket_t *socket = (isc__socket_t *)socket0;
 
        return ((short) socket->fd);

diff --git a/lib/isc/win32/libisc.def b/lib/isc/win32/libisc.def
index 3c20d99a3d325b7b185cb4b80ace3453fca981b8..226e0142382a4ccc47f148515f01a5de183ecf81 100644 (file)
--- a/lib/isc/win32/libisc.def
+++ b/lib/isc/win32/libisc.def
@@ -90,6 +90,7 @@ isc__socket_create
 isc__socket_detach
 isc__socket_dup
 isc__socket_filter
+isc__socket_getfd
 isc__socket_getname
 isc__socket_getpeername
 isc__socket_getsockname

diff --git a/lib/isc/win32/socket.c b/lib/isc/win32/socket.c
index 9367b3ce16ce9c08e07e82e9083d9be5b1e45522..1263bb6ba4596c30e72b28f65d5569fb2308ec0f 100644 (file)
--- a/lib/isc/win32/socket.c
+++ b/lib/isc/win32/socket.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: socket.c,v 1.90 2011/07/28 23:47:59 tbox Exp $ */
+/* $Id: socket.c,v 1.91 2011/08/23 17:02:53 each Exp $ */
 
 /* This code uses functions which are only available on Server 2003 and
  * higher, and Windows XP and higher.
@@ -1681,7 +1681,12 @@ socket_create(isc_socketmgr_t *manager, int pf, isc_sockettype_t type,
                        break;
                }
        } else {
-               sock->fd = dup(dup_socket->fd);
+               /*
+                * XXX: dup() is deprecated in windows, use _dup()
+                * instead.  In future we may want to investigate
+                * WSADuplicateSocket().
+                */
+               sock->fd = _dup(dup_socket->fd);
                sock->dupped = 1;
        }
 

diff --git a/lib/isccfg/win32/libisccfg.def b/lib/isccfg/win32/libisccfg.def
index 6e6f4b42885226ebfc44f505912cf33c1257b713..98abbcf8e25f3966fd559ec36442243cff09f53d 100644 (file)
--- a/lib/isccfg/win32/libisccfg.def
+++ b/lib/isccfg/win32/libisccfg.def
@@ -5,7 +5,6 @@ EXPORTS
 
 cfg_acl_fromconfig
 cfg_aclconfctx_attach
-cfg_aclconfctx_clear
 cfg_aclconfctx_create
 cfg_aclconfctx_detach
 cfg_list_first