com php-src: HAVE_STRNLEN should be in all toolsets : win32/build/config.w32 win32/build/config .w32.phpize.in
| From: | Anatol Belski | Date: | Thu, 13 Nov 2014 09:47:57 +0000 |
| Subject: | com php-src: HAVE_STRNLEN should be in all toolsets : win32/build/config.w32 win32/build/config .w32.phpize.in | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83077@lists.php.net to get a copy of this message | ||
Commit: 191fe09e33226ddd7f4e52a0b9143db2be156f96
Author: Anatol Belski <ab@php.net> Thu, 13 Nov 2014 10:47:57 +0100
Parents: 8644f4624cfcf95dc71005b37b7102e2c96f2466
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=191fe09e33226ddd7f4e52a0b9143db2be156f96
Log:
HAVE_STRNLEN should be in all toolsets
Changed paths:
M win32/build/config.w32
M win32/build/config.w32.phpize.in
Diff:
diff --git a/win32/build/config.w32 b/win32/build/config.w32
index 748631d..61e1882 100644
--- 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 6a33dc2..97f1f7d 100644
--- 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);
}