HAVE_STRNLEN should be in all toolsets

diff --git a/win32/build/config.w32 b/win32/build/config.w32
index 748631dddeb810c413f9a8cf577cedb19e13a3e6..61e1882ce4c41927091e57bb639b748331083825 100644 (file)
--- a/win32/build/config.w32
+++ b/win32/build/config.w32
@@ -146,7 +146,7 @@ ADD_SOURCES("win32", "inet.c fnmatch.c sockets.c");
 if (VS_TOOLSET && VCVERS <= 1300) {
        ADD_SOURCES("win32", "strtoi64.c");
 }
-if (VS_TOOLSET && VCVERS >= 1400 || ICC_TOOLSET) {
+if (VS_TOOLSET && VCVERS >= 1400 || !VS_TOOLSET) {
        AC_DEFINE('HAVE_STRNLEN', 1);
 }
 

diff --git a/win32/build/config.w32.phpize.in b/win32/build/config.w32.phpize.in
index 6a33dc20362bda8a4aa144a922ad2d5aebb960cd..97f1f7d638821c17f98abef16817776dcc8d4afd 100644 (file)
--- a/win32/build/config.w32.phpize.in
+++ b/win32/build/config.w32.phpize.in
@@ -106,7 +106,7 @@ if (VS_TOOLSET && VCVERS == 1200) {
        AC_DEFINE('ZEND_DVAL_TO_LVAL_CAST_OK', 1);\r
 }\r
 \r
-if (ICC_TOOLSET || VS_TOOLSET && VCVERS >= 1400) {\r
+if (!VS_TOOLSET || VS_TOOLSET && VCVERS >= 1400) {\r
        AC_DEFINE('HAVE_STRNLEN', 1);\r
 }\r
 \r