From: Bob Weinand <bobwei9@hotmail.com>
Date: Sun, 5 Oct 2014 11:57:35 +0000 (+0200)
Subject: Use PHP 5.4 compatible zend_execute in #if
X-Git-Tag: php-5.6.3RC1~51^2~63
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8b6d707df079529d4bf13098aa7f2b9686c14e59;p=php

Use PHP 5.4 compatible zend_execute in #if
---

diff --git a/phpdbg_prompt.c b/phpdbg_prompt.c
index 9341f5aafb..9333e0f717 100644
--- a/phpdbg_prompt.c
+++ b/phpdbg_prompt.c
@@ -1325,10 +1325,18 @@ next:
 
 		/* stupid hack to make zend_do_fcall_common_helper return ZEND_VM_ENTER() instead of recursively calling zend_execute() and eventually segfaulting */
 		if ((execute_data->opline->opcode == ZEND_DO_FCALL_BY_NAME || execute_data->opline->opcode == ZEND_DO_FCALL) && execute_data->function_state.function->type == ZEND_USER_FUNCTION) {
+#if PHP_VERSION_ID < 50500
+			zend_execute = execute;
+#else
 			zend_execute_ex = execute_ex;
+#endif
 		}
 		PHPDBG_G(vmret) = execute_data->opline->handler(execute_data TSRMLS_CC);
+#if PHP_VERSION_ID < 50500
+		zend_execute = phpdbg_execute_ex;
+#else
 		zend_execute_ex = phpdbg_execute_ex;
+#endif
 
 		if (PHPDBG_G(vmret) > 0) {
 			switch (PHPDBG_G(vmret)) {