From ba6d193b4cc4992104a7543509dc4db01832ee97 Mon Sep 17 00:00:00 2001 From: Bob Weinand Date: Wed, 30 Sep 2015 12:39:09 +0200 Subject: Add NTS/ZTS information to php -v --- sapi/cli/php_cli.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'sapi/cli/php_cli.c') diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index 94d5b84f67..b4288b87a2 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(); -- cgit v1.2.1