1617. [port] win32: VC++ 6.0 support.

diff --git a/CHANGES b/CHANGES
index eace48f17de040fff635fc8376e33944c010172e..65b85327ffe746ff1baf5d42fa77ec13b5d40da2 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+1617.  [port]          win32: VC++ 6.0 support.
+
 1616.  [placeholder]   rt11127
 
 1615.  [port]          Define ISC_SOCKADDR_LEN_T based on _BSD_SOCKLEN_T_ if

diff --git a/bin/named/server.c b/bin/named/server.c
index 1ce9565aa8a6e4236036dfbdfec4a95936919421..50e5cd56663489143575cb3d9f6d44f9b13f900e 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: server.c,v 1.422 2004/04/15 23:40:21 marka Exp $ */
+/* $Id: server.c,v 1.423 2004/04/19 04:16:54 marka Exp $ */
 
 #include <config.h>
 
@@ -937,7 +937,7 @@ configure_view(dns_view_t *view, cfg_obj_t *config, cfg_obj_t *vconfig,
                udpsize = 512;
        if (udpsize > 4096)
                udpsize = 4096;
-       dns_resolver_setudpsize(view->resolver, udpsize);
+       dns_resolver_setudpsize(view->resolver, (isc_uint16_t)udpsize);
        
        /*
         * Set supported DNSSEC algorithms.
@@ -2070,7 +2070,7 @@ portlist_fromconf(dns_portlist_t *portlist, unsigned int family,
             element != NULL;
             element = cfg_list_next(element)) {
                cfg_obj_t *obj = cfg_listelt_value(element);
-               in_port_t port = cfg_obj_asuint32(obj);
+               in_port_t port = (in_port_t)cfg_obj_asuint32(obj);
                
                result = dns_portlist_add(portlist, family, port);
                if (result != ISC_R_SUCCESS)
@@ -2231,7 +2231,7 @@ load_configuration(const char *filename, ns_server_t *server,
                udpsize = 512;
        if (udpsize > 4096)
                udpsize = 4096;
-       ns_g_udpsize = udpsize;
+       ns_g_udpsize = (isc_uint16_t)udpsize;
 
        /*
         * Configure the zone manager.

diff --git a/bin/win32/BINDInstall/BINDInstallDlg.cpp b/bin/win32/BINDInstall/BINDInstallDlg.cpp
index b08d4b21eecde468165e06eb77868a1197180b2f..44fe7d2cdbccbf58c9750c76d6a90ac0af24c45b 100644 (file)
--- a/bin/win32/BINDInstall/BINDInstallDlg.cpp
+++ b/bin/win32/BINDInstall/BINDInstallDlg.cpp
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: BINDInstallDlg.cpp,v 1.15 2004/03/16 05:52:15 marka Exp $ */
+/* $Id: BINDInstallDlg.cpp,v 1.16 2004/04/19 04:16:54 marka Exp $ */
 
 /*
  * Copyright (c) 1999-2000 by Nortel Networks Corporation
@@ -113,8 +113,10 @@ const FileData installFiles[] =
        {"msvcrt.dll", FileData::WinSystem, FileData::Critical, TRUE},
 #  endif
 #endif
+#if _MSC_VER > 1200
        {"mfc70.dll", FileData::WinSystem, FileData::Critical, TRUE},
        {"msvcr70.dll", FileData::WinSystem, FileData::Critical, TRUE},
+#endif
        {"bindevt.dll", FileData::WinSystem, FileData::Normal, FALSE},
        {"libbind9.dll", FileData::WinSystem, FileData::Critical, FALSE},
        {"libisc.dll", FileData::WinSystem, FileData::Critical, FALSE},
@@ -435,7 +437,7 @@ void CBINDInstallDlg::OnInstall() {
                m_accountExists = TRUE;
        }
 
-       ProgramGroup();
+       ProgramGroup(FALSE);
 
        try {
                CreateDirs();
@@ -473,7 +475,7 @@ void CBINDInstallDlg::OnInstall() {
                        RegCloseKey(hKey);
                }
        
-               ProgramGroup();
+               ProgramGroup(FALSE);
                
                if (m_startOnInstall)
                        StartBINDService();

diff --git a/lib/isc/win32/include/isc/ipv6.h b/lib/isc/win32/include/isc/ipv6.h
index a390168b3d8dabf091f985ac4abfaea783bfa364..db07a5299e43a353a9aed65e162c0bd746549f5a 100644 (file)
--- a/lib/isc/win32/include/isc/ipv6.h
+++ b/lib/isc/win32/include/isc/ipv6.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ipv6.h,v 1.12 2004/03/16 05:52:23 marka Exp $ */
+/* $Id: ipv6.h,v 1.13 2004/04/19 04:16:55 marka Exp $ */
 
 #ifndef ISC_IPV6_H
 #define ISC_IPV6_H 1
@@ -43,6 +43,10 @@
  *     RFC 2553.
  */
 
+#if _MSC_VER < 1300
+#define in6_addr in_addr6
+#endif
+
 #ifndef IN6ADDR_ANY_INIT
 #define IN6ADDR_ANY_INIT       {{ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }}
 #endif

diff --git a/lib/isc/win32/include/isc/net.h b/lib/isc/win32/include/isc/net.h
index a414f2f5a2164ba100a68087a8736d771040bf79..f42105ead94ecc3245485d4287e6a35175f28be5 100644 (file)
--- a/lib/isc/win32/include/isc/net.h
+++ b/lib/isc/win32/include/isc/net.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: net.h,v 1.21 2004/03/05 05:12:05 marka Exp $ */
+/* $Id: net.h,v 1.22 2004/04/19 04:16:55 marka Exp $ */
 
 #ifndef ISC_NET_H
 #define ISC_NET_H 1
@@ -117,6 +117,11 @@ struct in6_pktinfo {
 };
 #endif
 
+#if _MSC_VER < 1300
+#define in6addr_any isc_in6addr_any
+#define in6addr_loopback isc_in6addr_loopback
+#endif
+
 /*
  * Ensure type in_port_t is defined.
  */

diff --git a/lib/isc/win32/include/isc/platform.h b/lib/isc/win32/include/isc/platform.h
index 6c399099c912e6d6d9442f95fc24158630055f5c..a94d039dfddd59d38dddcd505b3040a68c32fcac 100644 (file)
--- a/lib/isc/win32/include/isc/platform.h
+++ b/lib/isc/win32/include/isc/platform.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: platform.h,v 1.9 2004/03/16 05:52:23 marka Exp $ */
+/* $Id: platform.h,v 1.10 2004/04/19 04:16:55 marka Exp $ */
 
 #ifndef ISC_PLATFORM_H
 #define ISC_PLATFORM_H 1
@@ -31,7 +31,9 @@
  ***/
 
 #define ISC_PLATFORM_HAVEIPV6
+#if _MSC_VER > 1200
 #define ISC_PLATFORM_HAVEIN6PKTINFO
+#endif
 #define ISC_PLATFORM_NEEDPORTT
 #undef MSG_TRUNC
 #define ISC_PLATFORM_NEEDNTOP