diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2014-10-28 23:07:46 +0100 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2014-10-28 23:07:46 +0100 |
| commit | 4fec48d1b0e1f5a11926fdd19a491d63c0ab9d2a (patch) | |
| tree | c99e7923b67eba4b9e96fe3cb91cf77fd9c454f4 /sapi/phpdbg/phpdbg_wait.c | |
| parent | 47fd168fede896f2e2f6752d7ffef67232b331f4 (diff) | |
| parent | a5415456d41ba63e9cf2fdc93f8e4c5fc28b42b1 (diff) | |
| download | php-git-4fec48d1b0e1f5a11926fdd19a491d63c0ab9d2a.tar.gz | |
Merge remote-tracking branch 'origin/PHP-5.6'
Diffstat (limited to 'sapi/phpdbg/phpdbg_wait.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg_wait.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sapi/phpdbg/phpdbg_wait.c b/sapi/phpdbg/phpdbg_wait.c index 68ccf6c123..40cf004d2b 100644 --- a/sapi/phpdbg/phpdbg_wait.c +++ b/sapi/phpdbg/phpdbg_wait.c @@ -345,7 +345,6 @@ void phpdbg_webdata_decompress(char *msg, int len TSRMLS_DC) { PHPDBG_COMMAND(wait) /* {{{ */ { -#ifdef HAVE_JSON struct sockaddr_un local, remote; int rlen, sr, sl; unlink(PHPDBG_G(socket_path)); @@ -397,5 +396,4 @@ PHPDBG_COMMAND(wait) /* {{{ */ phpdbg_notice("wait", "import=\"success\"", "Successfully imported request data, stopped before executing"); return SUCCESS; -#endif } /* }}} */ |