3187. [port] win32: support for Visual Studio 2008. [RT #26356]

diff --git a/CHANGES b/CHANGES
index 5b2c2c158c6e2994c4889fd248659f406111f927..be916f1e5e5311c383896f6ea890aa4efcd5cf1f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+3187.  [port]          win32: support for Visual Studio 2008.  [RT #26356]
+
 3179.  [port]          kfreebsd: build issues. [RT #26273]
 
 3175.   [bug]           Fix how DNSSEC positive wildcard responses from a

diff --git a/bin/win32/BINDInstall/StdAfx.h b/bin/win32/BINDInstall/StdAfx.h
index d5929bbadc93ffcee644bb2f7f37313bbc661ff7..9ed780d86231a4c3dabff476318976a870a411fc 100644 (file)
--- a/bin/win32/BINDInstall/StdAfx.h
+++ b/bin/win32/BINDInstall/StdAfx.h
@@ -3,6 +3,11 @@
 //      are changed infrequently
 //
 
+/*
+ * Minimum version is Windows XP
+ */
+#define _WIN32_WINNT 0x0501
+
 #ifndef _CRT_SECURE_NO_DEPRECATE
 #define _CRT_SECURE_NO_DEPRECATE 1
 #endif

diff --git a/config.h.win32 b/config.h.win32
index 0a4abd16215166f2cbfe875b70347b04656c9b5b..2aaf06c288cf8965e1d09db3c32b4507e080f02d 100644 (file)
--- a/config.h.win32
+++ b/config.h.win32
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: config.h.win32,v 1.19.48.2 2009/11/24 23:47:34 tbox Exp $ */
+/* $Id: config.h.win32,v 1.19.48.3 2011/10/30 23:46:37 marka Exp $ */
 
 /*
  * win32 configuration file
@@ -49,9 +49,10 @@
 #define _USE_32BIT_TIME_T 1
 
 /*
- * Windows NT and 2K only
+ * Minimum version is Windows XP
  */
-#define _WIN32_WINNT 0x0400
+#define _WIN32_WINNT 0x0501
+
 /* Define if you have the ANSI C header files.  */
 #define STDC_HEADERS 1
 
@@ -160,7 +161,9 @@
  */
 
 #define snprintf _snprintf
+#if _MSC_VER <= 1400
 #define vsnprintf _vsnprintf
+#endif
 #define strcasecmp  _stricmp
 #define strncasecmp _strnicmp
 #define strdup _strdup

diff --git a/lib/isc/win32/net.c b/lib/isc/win32/net.c
index 69cb95f16a3cff133363287dab0269fdc8ae951b..46b75fcd78c2dda44d598a5cee193c9aef211461 100644 (file)
--- a/lib/isc/win32/net.c
+++ b/lib/isc/win32/net.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: net.c,v 1.18.64.2 2009/09/23 23:47:15 tbox Exp $ */
+/* $Id: net.c,v 1.18.64.3 2011/10/30 23:46:38 marka Exp $ */
 
 #include <config.h>
 
@@ -166,7 +166,8 @@ try_ipv6only(void) {
        }
 
        on = 1;
-       if (setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, &on, sizeof(on)) < 0) {
+       if (setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, (const char *)&on,
+                      sizeof(on)) < 0) {
                ipv6only_result = ISC_R_NOTFOUND;
                goto close;
        }
@@ -189,7 +190,8 @@ try_ipv6only(void) {
        }
 
        on = 1;
-       if (setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, &on, sizeof(on)) < 0) {
+       if (setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, (const char *)&on,
+                      sizeof(on)) < 0) {
                ipv6only_result = ISC_R_NOTFOUND;
                goto close;
        }