com php-src: Add NTS/ZTS information to php -v: sapi/cli/php_ cli.c
| From: | Bob Weinand | Date: | Wed, 30 Sep 2015 10:39:09 +0000 |
| Subject: | com php-src: Add NTS/ZTS information to php -v: sapi/cli/php_ cli.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-89241@lists.php.net to get a copy of this message | ||
Commit: ba6d193b4cc4992104a7543509dc4db01832ee97
Author: Bob Weinand <bobwei9@hotmail.com> Wed, 30 Sep 2015 12:39:09 +0200
Parents: 3e74df74f951a4272061f0e67089228c6a6c23e1
Branches: PHP-7.0
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ba6d193b4cc4992104a7543509dc4db01832ee97
Log:
Add NTS/ZTS information to php -v
Changed paths:
M sapi/cli/php_cli.c
Diff:
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index 94d5b84..b4288b8 100644
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -682,17 +682,20 @@ static int do_cli(int argc, char **argv) /* {{{ */
goto out;
case 'v': /* show php version & quit */
- php_printf("PHP %s (%s) (built: %s %s) %s\nCopyright (c) 1997-2015 The PHP
Group\n%s",
+ php_printf("PHP %s (%s) (built: %s %s) ( %s)\nCopyright (c) 1997-2015 The PHP
Group\n%s",
PHP_VERSION, cli_sapi_module.name, __DATE__, __TIME__,
-#if ZEND_DEBUG && defined(HAVE_GCOV)
- "(DEBUG GCOV)",
-#elif ZEND_DEBUG
- "(DEBUG)",
-#elif defined(HAVE_GCOV)
- "(GCOV)",
+#if ZTS
+ "ZTS "
#else
- "",
+ "NTS "
#endif
+#if ZEND_DEBUG
+ "DEBUG "
+#endif
+#ifdef HAVE_GCOV
+ "GCOV "
+#endif
+ ,
get_zend_version()
);
sapi_deactivate();