diff options
| author | David Soria Parra <dsp@php.net> | 2012-12-04 21:01:32 +0100 |
|---|---|---|
| committer | David Soria Parra <dsp@php.net> | 2012-12-04 21:01:32 +0100 |
| commit | 15a251a424918e0242fb868a063353e250d8f89f (patch) | |
| tree | ae95a66361a3ccbf103a5670d8b9bc432f71991b | |
| parent | 3de00bc6152cec1c017877aca75bc92e4a034585 (diff) | |
| download | php-git-15a251a424918e0242fb868a063353e250d8f89f.tar.gz | |
Overwrite execute_ex instead of execute in dtrace_execute
| -rw-r--r-- | Zend/zend_dtrace.c | 4 | ||||
| -rw-r--r-- | Zend/zend_dtrace.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Zend/zend_dtrace.c b/Zend/zend_dtrace.c index 3d109deabd..4e857a1862 100644 --- 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 49388e562f..73c8845281 100644 --- 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> |