diff options
| author | Xinchen Hui <laruence@php.net> | 2014-10-31 17:35:19 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2014-10-31 17:36:33 +0800 |
| commit | d017c4bf3ae8c49340b56f9ab1d31d2793f65489 (patch) | |
| tree | 5662abd5c1854fd86783082073860dcfc06c47b2 /sapi/phpdbg/phpdbg.c | |
| parent | d9d181e5ad41128a97a6e01d14fb766ff7bf31a8 (diff) | |
| parent | 113f1fd6d5eb286c50f6cca003d18f847bc202cb (diff) | |
| download | php-git-d017c4bf3ae8c49340b56f9ab1d31d2793f65489.tar.gz | |
Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6
Diffstat (limited to 'sapi/phpdbg/phpdbg.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c index 7ca7997297..6ee41b7586 100644 --- a/sapi/phpdbg/phpdbg.c +++ b/sapi/phpdbg/phpdbg.c @@ -779,7 +779,9 @@ const opt_struct OPTIONS[] = { /* {{{ */ {'S', 1, "sapi-name"}, {'l', 1, "listen"}, {'a', 1, "address-or-any"}, +#if PHPDBG_IN_DEV {'x', 0, "xml output"}, +#endif {'V', 0, "version"}, {'-', 0, NULL} }; /* }}} */ @@ -1213,8 +1215,10 @@ phpdbg_main: } else address = strdup(php_optarg); } break; +#if PHPDBG_IN_DEV case 'x': flags |= PHPDBG_WRITE_XML; +#endif break; case 'V': { |