From 191fe09e33226ddd7f4e52a0b9143db2be156f96 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Thu, 13 Nov 2014 10:47:57 +0100 Subject: [PATCH] HAVE_STRNLEN should be in all toolsets --- win32/build/config.w32 | 2 +- win32/build/config.w32.phpize.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/win32/build/config.w32 b/win32/build/config.w32 index 748631ddde..61e1882ce4 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 6a33dc2036..97f1f7d638 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); } -- 2.50.1