com php-src: Fixed phpdbg build broken when dtrace enabled: Zend/zend_dtrace.c Zend/zend_dtrace.h
| From: | Xinchen Hui | Date: | Tue, 07 Apr 2015 15:04:34 +0000 |
| Subject: | com php-src: Fixed phpdbg build broken when dtrace enabled: Zend/zend_dtrace.c Zend/zend_dtrace.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-88865@lists.php.net to get a copy of this message | ||
Commit: 4e2afbc1a0e539cbf59791bb92aca7afaa1b7af3
Author: Reeze Xia <reeze@php.net> Tue, 7 Apr 2015 23:04:34 +0800
Parents: 624552c3d70a8622b1dbad41dc67acf8ec197100
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4e2afbc1a0e539cbf59791bb92aca7afaa1b7af3
Log:
Fixed phpdbg build broken when dtrace enabled
This also fixed a zend_string related warning
Changed paths:
M Zend/zend_dtrace.c
M Zend/zend_dtrace.h
Diff:
diff --git a/Zend/zend_dtrace.c b/Zend/zend_dtrace.c
index a468247..242267a 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 17b5b53..f2250ec 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);