diff options
| author | Anatol Belski <ab@php.net> | 2016-10-29 17:57:33 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-10-29 17:57:33 +0200 |
| commit | 87cb91ea7c0c3b864042965b6b893a690df08df7 (patch) | |
| tree | 274e10a1a2107f0b4fd989da83051259ea7a08e7 /win32 | |
| parent | e6b7e6081e195876968f420108c973ba9282c78d (diff) | |
| parent | c7ec36d4fa4c70fc5bf4061efad74c55376041bb (diff) | |
| download | php-git-87cb91ea7c0c3b864042965b6b893a690df08df7.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix condition
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/build/confutils.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/win32/build/confutils.js b/win32/build/confutils.js index 391d6c1256..f1b8d385a6 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -1825,7 +1825,7 @@ function generate_test_php_ini() return; } - var ini_dir = PHP_OBJECT_OUT_DIR + ("yes" == PHP_DEBUG ? "Debug" : "Release") + (PHP_ZTS ? "_TS" : ""); + var ini_dir = PHP_OBJECT_OUT_DIR + ("yes" == PHP_DEBUG ? "Debug" : "Release") + ("yes" == PHP_ZTS ? "_TS" : ""); PHP_TEST_INI_PATH = ini_dir + "\\test.ini"; if (FSO.FileExists(PHP_TEST_INI_PATH)) { |