diff options
| author | Remi Collet <remi@php.net> | 2014-10-29 07:26:58 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2014-10-29 07:26:58 +0100 |
| commit | 770473a64827f8808c1ee4851cedb3371e60699d (patch) | |
| tree | 6fa6dc04a7eef69cd5c6bfebe993d378379fbab6 /sapi/phpdbg/phpdbg_wait.c | |
| parent | 4fec48d1b0e1f5a11926fdd19a491d63c0ab9d2a (diff) | |
| parent | 7dd871438fec9eaccf06c235faba1f51ff2967da (diff) | |
| download | php-git-770473a64827f8808c1ee4851cedb3371e60699d.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
cleanup uneeded json
Diffstat (limited to 'sapi/phpdbg/phpdbg_wait.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg_wait.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sapi/phpdbg/phpdbg_wait.c b/sapi/phpdbg/phpdbg_wait.c index 40cf004d2b..a8cf7491c4 100644 --- a/sapi/phpdbg/phpdbg_wait.c +++ b/sapi/phpdbg/phpdbg_wait.c @@ -22,7 +22,6 @@ #include "ext/standard/basic_functions.h" ZEND_EXTERN_MODULE_GLOBALS(phpdbg); -ZEND_EXTERN_MODULE_GLOBALS(json); static void phpdbg_rebuild_http_globals_array(int type, const char *name TSRMLS_DC) { zval *zvp; |