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

diff --git a/CHANGES b/CHANGES
index ed08d4ae14780146a2bcc6a4de9c1f560bffc228..c5e57e607c0e246729f8d448b08e63f7160e2a46 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+1617.  [port]          win32: VC++ 6.0 support.
+
 1615.  [port]          Define ISC_SOCKADDR_LEN_T based on _BSD_SOCKLEN_T_ if
                        it is defined.
 

diff --git a/bin/win32/BINDInstall/BINDInstall.cpp b/bin/win32/BINDInstall/BINDInstall.cpp
index 3b143d76f43d73827213b1134890df92a418616a..e996df9eaa27f6b84d3148df7a91b644316cf034 100644 (file)
--- a/bin/win32/BINDInstall/BINDInstall.cpp
+++ b/bin/win32/BINDInstall/BINDInstall.cpp
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: BINDInstall.cpp,v 1.3.2.1 2004/03/09 06:10:31 marka Exp $ */
+/* $Id: BINDInstall.cpp,v 1.3.2.2 2004/04/19 06:56:24 marka Exp $ */
 
 /*
  * Copyright (c) 1999-2000 by Nortel Networks Corporation
@@ -78,11 +78,12 @@ BOOL CBINDInstallApp::InitInstance()
        // If you are not using these features and wish to reduce the size
        //  of your final executable, you should remove from the following
        //  the specific initialization routines you do not need.
-
+#if _MSC_VER < 1300
 #ifdef _AFXDLL
        Enable3dControls();                     // Call this when using MFC in a shared DLL
 #else
        Enable3dControlsStatic();       // Call this when linking to MFC statically
+#endif
 #endif
 
        CBINDInstallDlg dlg;

diff --git a/bin/win32/BINDInstall/BINDInstallDlg.cpp b/bin/win32/BINDInstall/BINDInstallDlg.cpp
index 544a19677cf5773252ceb1e820fe2d5ec9476c47..6f5844ec7479a2308bf452816dd09d97883e3824 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.6.2.9 2004/03/09 06:10:31 marka Exp $ */
+/* $Id: BINDInstallDlg.cpp,v 1.6.2.10 2004/04/19 06:56:24 marka Exp $ */
 
 /*
  * Copyright (c) 1999-2000 by Nortel Networks Corporation
@@ -109,8 +109,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},
        {"libisc.dll", FileData::WinSystem, FileData::Critical, FALSE},
        {"libisccfg.dll", FileData::WinSystem, FileData::Critical, FALSE},

diff --git a/config.h.win32 b/config.h.win32
index 50a5234334899c334f7427feee23ed5f6a2f7e31..318df49bd0a60ac63215944451a3bf742de02489 100644 (file)
--- a/config.h.win32
+++ b/config.h.win32
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: config.h.win32,v 1.6.2.2 2004/04/10 04:07:08 marka Exp $ */
+/* $Id: config.h.win32,v 1.6.2.3 2004/04/19 06:56:23 marka Exp $ */
 
 /*
  * win32 configuration file
@@ -202,7 +202,7 @@ typedef long off_t;
 #define close  _close
 #define write  _write
 #endif
-
+#include <io.h>
 #define isatty        _isatty
 
 #ifndef _WINSOCKAPI_