summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Weinand <bobwei9@hotmail.com>2014-10-29 11:40:56 +0100
committerBob Weinand <bobwei9@hotmail.com>2014-10-29 11:40:56 +0100
commit6545a5c234de93cfa15611ccad4f97d8fade038c (patch)
tree74d13dcef8da5a3685923e16bd0e9c394d762bd3
parent919bd3eb0cafb33c6002c32c5458392093700d68 (diff)
parent89e613cf01b1a57da3ee4431b43296bd92342397 (diff)
downloadphp-git-6545a5c234de93cfa15611ccad4f97d8fade038c.tar.gz
Merge php-src into phpdbg
-rw-r--r--phpdbg_wait.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/phpdbg_wait.c b/phpdbg_wait.c
index 3f5ee24faa..95024b8d77 100644
--- a/phpdbg_wait.c
+++ b/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 **zvpp;