Overwrite execute_ex instead of execute in dtrace_execute

diff --git a/Zend/zend_dtrace.c b/Zend/zend_dtrace.c
index 3d109deabd96dc910c22a1e334c9804efe420861..4e857a1862844cea8d6abb85605df937c2ae4d44 100644 (file)
--- a/Zend/zend_dtrace.c
+++ b/Zend/zend_dtrace.c
@@ -44,7 +44,7 @@ ZEND_API zend_op_array *dtrace_compile_file(zend_file_handle *file_handle, int t
 }
 
 /* We wrap the execute function to have fire the execute-entry/return and function-entry/return probes */
-ZEND_API void dtrace_execute(zend_op_array *op_array TSRMLS_DC)
+ZEND_API void dtrace_execute_ex(zend_op_array *op_array TSRMLS_DC)
 {
        int lineno;
        char *scope, *filename, *funcname, *classname;
@@ -72,7 +72,7 @@ ZEND_API void dtrace_execute(zend_op_array *op_array TSRMLS_DC)
                DTRACE_FUNCTION_ENTRY(funcname, filename, lineno, classname, scope);
        }
 
-       execute(op_array TSRMLS_CC);
+       execute_ex(op_array TSRMLS_CC);
 
        if (DTRACE_FUNCTION_RETURN_ENABLED() && funcname != NULL) {
                DTRACE_FUNCTION_RETURN(funcname, filename, lineno, classname, scope);

diff --git a/Zend/zend_dtrace.h b/Zend/zend_dtrace.h
index 49388e562f7ffc40be223f68bc868a0707904443..73c884528137ce289eb668d90aaec494fcef382d 100644 (file)
--- a/Zend/zend_dtrace.h
+++ b/Zend/zend_dtrace.h
@@ -35,7 +35,7 @@ ZEND_API void (*zend_dtrace_execute)(zend_op_array *op_array TSRMLS_DC);
 ZEND_API void (*zend_dtrace_execute_internal)(zend_execute_data *execute_data_ptr, zend_fcall_info *fci, int return_value_used TSRMLS_DC);
 
 ZEND_API zend_op_array *dtrace_compile_file(zend_file_handle *file_handle, int type TSRMLS_DC);
-ZEND_API void dtrace_execute(zend_op_array *op_array TSRMLS_DC);
+ZEND_API void dtrace_execute_ex(zend_op_array *op_array TSRMLS_DC);
 ZEND_API void dtrace_execute_internal(zend_execute_data *execute_data_ptr, zend_fcall_info *fci, int return_value_used TSRMLS_DC);
 #include <zend_dtrace_gen.h>