From 5ed76fa7ea83d3ce7a33d365aa3b84410c3b8773 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Mon, 19 Apr 2004 04:16:55 +0000
Subject: [PATCH] 1617.   [port]          win32: VC++ 6.0 support.

---
 CHANGES                                  | 2 ++
 bin/named/server.c                       | 8 ++++----
 bin/win32/BINDInstall/BINDInstallDlg.cpp | 8 +++++---
 lib/isc/win32/include/isc/ipv6.h         | 6 +++++-
 lib/isc/win32/include/isc/net.h          | 7 ++++++-
 lib/isc/win32/include/isc/platform.h     | 4 +++-
 6 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/CHANGES b/CHANGES
index eace48f17d..65b85327ff 100644
--- 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 1ce9565aa8..50e5cd5666 100644
--- 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 b08d4b21ee..44fe7d2cdb 100644
--- 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 a390168b3d..db07a5299e 100644
--- 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 a414f2f5a2..f42105ead9 100644
--- 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 6c399099c9..a94d039dfd 100644
--- 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