From: Mark Andrews <marka@isc.org>
Date: Wed, 27 Sep 2006 00:29:10 +0000 (+0000)
Subject: 2083.   [port]          win32: Visual C++ 2005 support.
X-Git-Tag: v9.3.3rc3~50
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=c02612f8abaf600333eff101d3ea003af835cc7e;p=thirdparty%2Fbind9.git

2083.   [port]          win32: Visual C++ 2005 support.
---

diff --git a/CHANGES b/CHANGES
index a74981a8eb0..75bf004f9b5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+2083.	[port]		win32: Visual C++ 2005 support.
+
 2082.	[doc]		Document 'cache-file' as a test only option.
 
 	--- 9.3.3rc2 released ---
diff --git a/bin/win32/BINDInstall/BINDInstallDlg.cpp b/bin/win32/BINDInstall/BINDInstallDlg.cpp
index adc040aefe3..058c762bd22 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.6.2.6.2.14 2006/02/26 22:28:36 marka Exp $ */
+/* $Id: BINDInstallDlg.cpp,v 1.6.2.6.2.15 2006/09/27 00:29:10 marka Exp $ */
 
 /*
  * Copyright (c) 1999-2000 by Nortel Networks Corporation
@@ -113,7 +113,10 @@ const FileData installFiles[] =
 	{"msvcrt.dll", FileData::WinSystem, FileData::Critical, TRUE},
 #  endif
 #endif
-#if _MSC_VER >= 1310
+#if _MSC_VER >= 1400
+	{"mfc80.dll", FileData::WinSystem, FileData::Critical, TRUE},
+	{"msvcr80.dll", FileData::WinSystem, FileData::Critical, TRUE},
+#elif _MSC_VER >= 1310
 	{"mfc71.dll", FileData::WinSystem, FileData::Critical, TRUE},
 	{"msvcr71.dll", FileData::WinSystem, FileData::Critical, TRUE},
 #elif _MSC_VER > 1200
diff --git a/bin/win32/BINDInstall/StdAfx.h b/bin/win32/BINDInstall/StdAfx.h
index 2607529ccb8..d5929bbadc9 100644
--- a/bin/win32/BINDInstall/StdAfx.h
+++ b/bin/win32/BINDInstall/StdAfx.h
@@ -3,6 +3,10 @@
 //      are changed infrequently
 //
 
+#ifndef _CRT_SECURE_NO_DEPRECATE
+#define _CRT_SECURE_NO_DEPRECATE 1
+#endif
+
 #if !defined(AFX_STDAFX_H__61537819_39FC_11D3_A97A_00105A12BD65__INCLUDED_)
 #define AFX_STDAFX_H__61537819_39FC_11D3_A97A_00105A12BD65__INCLUDED_
 
diff --git a/config.h.win32 b/config.h.win32
index ec409aa1a38..5c713140d14 100644
--- a/config.h.win32
+++ b/config.h.win32
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: config.h.win32,v 1.6.12.7 2006/05/26 01:42:54 marka Exp $ */
+/* $Id: config.h.win32,v 1.6.12.8 2006/09/27 00:29:10 marka Exp $ */
 
 /*
  * win32 configuration file
@@ -38,6 +38,16 @@
  */
 #define __STDC__ 1
 
+/*
+ * Silence compiler warnings about using strcpy and friends.
+ */
+#define _CRT_SECURE_NO_DEPRECATE 1
+
+/*
+ * Use 32 bit time.
+ */
+#define _USE_32BIT_TIME_T 1
+
 /*
  * Windows NT and 2K only
  */
diff --git a/win32utils/BuildAll.bat b/win32utils/BuildAll.bat
index c0077b9edcb..cedfa4b18e2 100644
--- a/win32utils/BuildAll.bat
+++ b/win32utils/BuildAll.bat
@@ -30,6 +30,10 @@ rem a future release of BIND 9 for Windows NT/2000/XP.
 
 echo Setting up the BIND files required for the build
 
+rem Get and update for the latest build of the openssl library
+perl updateopenssl.pl
+
+rem Setup the files
 call BuildSetup.bat
 
 echo Build all of the Library files
diff --git a/win32utils/updateopenssl.pl b/win32utils/updateopenssl.pl
index 6a818338ef9..4279b3f8076 100644
--- a/win32utils/updateopenssl.pl
+++ b/win32utils/updateopenssl.pl
@@ -14,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: updateopenssl.pl,v 1.3 2006/09/25 04:23:59 marka Exp $
+# $Id: updateopenssl.pl,v 1.3.10.1 2006/09/27 00:29:10 marka Exp $
 
 # updateopenssl.pl
 # This script locates the latest version of OpenSSL in the grandparent