[php-src] master: Revert php_output_stack_* signature change
| From: | Gina Peter Banyard | Date: | Fri, 19 Apr 2024 12:44:32 +0000 |
| Subject: | [php-src] master: Revert php_output_stack_* signature change | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-128166@lists.php.net to get a copy of this message | ||
Author: Gina Peter Banyard (Girgias)
Date: 2024-04-19T13:44:21+01:00
Commit: https://github.com/php/php-src/commit/e0f24ab3e389f29ba8b606f3b4b633dc42f0457b
Raw diff: https://github.com/php/php-src/commit/e0f24ab3e389f29ba8b606f3b4b633dc42f0457b.diff
Revert php_output_stack_* signature change
This was unintentional and meant to be done in a follow-up PR
Changed paths:
M main/output.c
Diff:
diff --git a/main/output.c b/main/output.c
index b5307ff65973..dfa11f380739 100644
--- a/main/output.c
+++ b/main/output.c
@@ -61,8 +61,7 @@ static inline void php_output_context_reset(php_output_context *context);
static inline void php_output_context_swap(php_output_context *context);
static inline void php_output_context_dtor(php_output_context *context);
-static zend_result php_output_stack_pop(int flags);
-
+static int php_output_stack_pop(int flags);
static int php_output_stack_apply_op(void *h, void *c);
static int php_output_stack_apply_clean(void *h, void *c);
static int php_output_stack_apply_list(void *h, void *z);