diff options
| author | Reeze Xia <reeze@php.net> | 2015-04-07 23:04:34 +0800 |
|---|---|---|
| committer | Reeze Xia <reeze@php.net> | 2015-04-07 23:04:34 +0800 |
| commit | 4e2afbc1a0e539cbf59791bb92aca7afaa1b7af3 (patch) | |
| tree | 5f47685a37357f614d44ed228a930f61b71b2ba5 /Zend/zend_dtrace.c | |
| parent | 624552c3d70a8622b1dbad41dc67acf8ec197100 (diff) | |
| download | php-git-4e2afbc1a0e539cbf59791bb92aca7afaa1b7af3.tar.gz | |
Fixed phpdbg build broken when dtrace enabled
This also fixed a zend_string related warning
Diffstat (limited to 'Zend/zend_dtrace.c')
| -rw-r--r-- | Zend/zend_dtrace.c | 9 |
1 files changed, 7 insertions, 2 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; } |