From c4b188871e7abb7c6cc20d05ceda4cea082efcd2 Mon Sep 17 00:00:00 2001 From: James Titcumb Date: Tue, 16 Feb 2016 22:47:37 +0000 Subject: Fix bug #71575 removing extra semicolons outside macros --- sapi/phpdbg/phpdbg_wait.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sapi/phpdbg/phpdbg_wait.c') diff --git a/sapi/phpdbg/phpdbg_wait.c b/sapi/phpdbg/phpdbg_wait.c index c3ae23b7cd..7972d5ec96 100644 --- a/sapi/phpdbg/phpdbg_wait.c +++ b/sapi/phpdbg/phpdbg_wait.c @@ -21,7 +21,7 @@ #include "ext/standard/php_var.h" #include "ext/standard/basic_functions.h" -ZEND_EXTERN_MODULE_GLOBALS(phpdbg); +ZEND_EXTERN_MODULE_GLOBALS(phpdbg) static void phpdbg_rebuild_http_globals_array(int type, const char *name) { zval *zvp; -- cgit v1.2.1 From 5602f6421372848a6fbb23fbe6bbca47d94dd49a Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 3 Mar 2016 23:13:50 +0100 Subject: Eliminate usages of _PP macros These are either in debug code (fix them), commented out (drop them) or in dead compatibility macros (drop them). One usage was in php_stream_get_from_zval(), which we have not used since at least PHP 5.2 and, judging from the fact that nobody complained about it causing compile errors in PHP 7, nobody else uses it either, so drop it. There are still remaining uses in mysqli embedded and odbc birdstep. These probably need to be dropped outright. --- sapi/phpdbg/phpdbg_wait.c | 5 ----- 1 file changed, 5 deletions(-) (limited to 'sapi/phpdbg/phpdbg_wait.c') diff --git a/sapi/phpdbg/phpdbg_wait.c b/sapi/phpdbg/phpdbg_wait.c index 7972d5ec96..c7dcd4fbd4 100644 --- a/sapi/phpdbg/phpdbg_wait.c +++ b/sapi/phpdbg/phpdbg_wait.c @@ -281,11 +281,6 @@ void phpdbg_webdata_decompress(char *msg, int len) { pefree(elm, zend_extensions.persistent); zend_extensions.count--; } else { -/* zend_hash_get_current_key_zval_ex(Z_ARRVAL_PP(zvpp), &key, &hpos); - if (Z_TYPE(key) == IS_LONG) { - zend_hash_index_del(Z_ARRVAL_PP(zvpp), Z_LVAL(key)); - } -*/ zend_hash_del(Z_ARRVAL_P(zvp), strkey); } } -- cgit v1.2.1