diff options
| author | Dmitry Stogov <dmitry@php.net> | 2008-11-27 19:01:23 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2008-11-27 19:01:23 +0000 |
| commit | 7d4fd3fd380a7fe9b497684775a38190786b93ba (patch) | |
| tree | 0ff7829b47dc4969052284b9ad9411c465bd424e /Zend/zend_API.h | |
| parent | d741138a4639adb14cb31ea519ded0e0432c9e9a (diff) | |
| download | php-git-7d4fd3fd380a7fe9b497684775a38190786b93ba.tar.gz | |
Fixed bug #46409 (__invoke method called outside of object context when using array_map)
Diffstat (limited to 'Zend/zend_API.h')
| -rw-r--r-- | Zend/zend_API.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Zend/zend_API.h b/Zend/zend_API.h index 5416619d83..2249f98e8b 100644 --- a/Zend/zend_API.h +++ b/Zend/zend_API.h @@ -48,7 +48,7 @@ typedef struct _zend_fcall_info { zval **retval_ptr_ptr; zend_uint param_count; zval ***params; - zval **object_pp; + zval *object_ptr; zend_bool no_separation; } zend_fcall_info; @@ -57,7 +57,7 @@ typedef struct _zend_fcall_info_cache { zend_function *function_handler; zend_class_entry *calling_scope; zend_class_entry *called_scope; - zval **object_pp; + zval *object_ptr; } zend_fcall_info_cache; #define ZEND_NS_NAME(ns, name) ns"\\"name @@ -277,7 +277,7 @@ ZEND_API void zend_wrong_param_count(TSRMLS_D); #define IS_CALLABLE_STRICT (IS_CALLABLE_CHECK_IS_STATIC) -ZEND_API zend_bool zend_is_callable_ex(zval *callable, zval **object_pp, uint check_flags, char **callable_name, int *callable_name_len, zend_fcall_info_cache *fcc, char **error TSRMLS_DC); +ZEND_API zend_bool zend_is_callable_ex(zval *callable, zval *object_ptr, uint check_flags, char **callable_name, int *callable_name_len, zend_fcall_info_cache *fcc, char **error TSRMLS_DC); ZEND_API zend_bool zend_is_callable(zval *callable, uint check_flags, char **callable_name TSRMLS_DC); ZEND_API zend_bool zend_make_callable(zval *callable, char **callable_name TSRMLS_DC); ZEND_API const char *zend_get_module_version(const char *module_name); |