diff options
| author | Xinchen Hui <laruence@php.net> | 2012-08-04 11:14:03 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-08-04 11:14:03 +0800 |
| commit | d289efb45771217a826f10def835a6185683a1eb (patch) | |
| tree | a81588d50643a05c936a3a3882c05d5fe9c6849f /Zend/zend_API.h | |
| parent | d1f0662e4d587754742891f0a179551d8f36674f (diff) | |
| parent | 03a1fcabf31210d3f304bfacf5096ce43c2b8f93 (diff) | |
| download | php-git-d289efb45771217a826f10def835a6185683a1eb.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
Conflicts:
Zend/zend_API.h
Diffstat (limited to 'Zend/zend_API.h')
| -rw-r--r-- | Zend/zend_API.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Zend/zend_API.h b/Zend/zend_API.h index f54db7f2e8..d7fbc3c3af 100644 --- a/Zend/zend_API.h +++ b/Zend/zend_API.h @@ -175,6 +175,11 @@ typedef struct _zend_fcall_info_cache { class_container.name = zend_strndup(cl_name, _len); \ } \ class_container.name_length = _len; \ + INIT_CLASS_ENTRY_INIT_METHODS(class_container, functions, handle_fcall, handle_propget, handle_propset, handle_propunset, handle_propisset) \ + } + +#define INIT_CLASS_ENTRY_INIT_METHODS(class_container, functions, handle_fcall, handle_propget, handle_propset, handle_propunset, handle_propisset) \ + { \ class_container.constructor = NULL; \ class_container.destructor = NULL; \ class_container.clone = NULL; \ |