HAVE_STRNLEN should be in all toolsets

weltling · weltling · commit 191fe09e3322 · 2014-11-13T10:47:57.000+01:00
diff --git 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
@@ -106,7 +106,7 @@ if (VS_TOOLSET && VCVERS == 1200) {
 	AC_DEFINE('ZEND_DVAL_TO_LVAL_CAST_OK', 1);
 }
 
-if (ICC_TOOLSET || VS_TOOLSET && VCVERS >= 1400) {
+if (!VS_TOOLSET || VS_TOOLSET && VCVERS >= 1400) {
 	AC_DEFINE('HAVE_STRNLEN', 1);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ ADD_SOURCES("win32", "inet.c fnmatch.c sockets.c");`
`146`	`146`	`if (VS_TOOLSET && VCVERS <= 1300) {`
`147`	`147`	`ADD_SOURCES("win32", "strtoi64.c");`
`148`	`148`	`}`
`149`		`-if (VS_TOOLSET && VCVERS >= 1400 \|\| ICC_TOOLSET) {`
	`149`	`+if (VS_TOOLSET && VCVERS >= 1400 \|\| !VS_TOOLSET) {`
`150`	`150`	`AC_DEFINE('HAVE_STRNLEN', 1);`
`151`	`151`	`}`
`152`	`152`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ if (VS_TOOLSET && VCVERS == 1200) {`
`106`	`106`	`AC_DEFINE('ZEND_DVAL_TO_LVAL_CAST_OK', 1);`
`107`	`107`	`}`
`108`	`108`
`109`		`-if (ICC_TOOLSET \|\| VS_TOOLSET && VCVERS >= 1400) {`
	`109`	`+if (!VS_TOOLSET \|\| VS_TOOLSET && VCVERS >= 1400) {`
`110`	`110`	`AC_DEFINE('HAVE_STRNLEN', 1);`
`111`	`111`	`}`
`112`	`112`