Commit 5ed76fa7 authored by Mark Andrews's avatar Mark Andrews
Browse files

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

parent ad3b537a
1617. [port] win32: VC++ 6.0 support.
1616. [placeholder] rt11127
1615. [port] Define ISC_SOCKADDR_LEN_T based on _BSD_SOCKLEN_T_ if
......
......@@ -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.
......
......@@ -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();
......
......@@ -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
......
......@@ -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.
*/
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment