From 4e2afbc1a0e539cbf59791bb92aca7afaa1b7af3 Mon Sep 17 00:00:00 2001 From: Reeze Xia Date: Tue, 7 Apr 2015 23:04:34 +0800 Subject: [PATCH] Fixed phpdbg build broken when dtrace enabled This also fixed a zend_string related warning --- Zend/zend_dtrace.c | 9 +++++++-- Zend/zend_dtrace.h | 6 +++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Zend/zend_dtrace.c b/Zend/zend_dtrace.c index a4682477c3..242267a59d 100644 --- a/Zend/zend_dtrace.c +++ b/Zend/zend_dtrace.c @@ -23,6 +23,11 @@ #include "zend_dtrace.h" #ifdef HAVE_DTRACE + +ZEND_API zend_op_array *(*zend_dtrace_compile_file)(zend_file_handle *file_handle, int type); +ZEND_API void (*zend_dtrace_execute)(zend_op_array *op_array); +ZEND_API void (*zend_dtrace_execute_internal)(zend_execute_data *execute_data, zval *return_value); + /* PHP DTrace probes {{{ */ static inline const char *dtrace_get_executed_filename(void) { @@ -41,9 +46,9 @@ static inline const char *dtrace_get_executed_filename(void) ZEND_API zend_op_array *dtrace_compile_file(zend_file_handle *file_handle, int type) { zend_op_array *res; - DTRACE_COMPILE_FILE_ENTRY(file_handle->opened_path, (char *)file_handle->filename); + DTRACE_COMPILE_FILE_ENTRY(file_handle->opened_path->val, (char *)file_handle->filename); res = compile_file(file_handle, type); - DTRACE_COMPILE_FILE_RETURN(file_handle->opened_path, (char *)file_handle->filename); + DTRACE_COMPILE_FILE_RETURN(file_handle->opened_path->val, (char *)file_handle->filename); return res; } diff --git a/Zend/zend_dtrace.h b/Zend/zend_dtrace.h index 17b5b538b6..f2250eccae 100644 --- a/Zend/zend_dtrace.h +++ b/Zend/zend_dtrace.h @@ -30,9 +30,9 @@ extern "C" { #endif #ifdef HAVE_DTRACE -ZEND_API zend_op_array *(*zend_dtrace_compile_file)(zend_file_handle *file_handle, int type); -ZEND_API void (*zend_dtrace_execute)(zend_op_array *op_array); -ZEND_API void (*zend_dtrace_execute_internal)(zend_execute_data *execute_data, zval *return_value); +ZEND_API extern zend_op_array *(*zend_dtrace_compile_file)(zend_file_handle *file_handle, int type); +ZEND_API extern void (*zend_dtrace_execute)(zend_op_array *op_array); +ZEND_API extern void (*zend_dtrace_execute_internal)(zend_execute_data *execute_data, zval *return_value); ZEND_API zend_op_array *dtrace_compile_file(zend_file_handle *file_handle, int type); ZEND_API void dtrace_execute_ex(zend_execute_data *execute_data); -- 2.40.0