diff options
| author | Marcus Boerger <helly@php.net> | 2006-05-27 19:04:16 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2006-05-27 19:04:16 +0000 |
| commit | f93bf1007ab5aed2cfb6e672e09c00f5c7b22f7f (patch) | |
| tree | 7fccb755c8833afd9e06c74c413d3311b60a37a5 | |
| parent | 341ffb3f3d7c1535165375a9fc17ed3906aa23c0 (diff) | |
| download | php-git-f93bf1007ab5aed2cfb6e672e09c00f5c7b22f7f.tar.gz | |
- WS
| -rw-r--r-- | Zend/zend_API.c | 2 | ||||
| -rw-r--r-- | Zend/zend_compile.c | 1 | ||||
| -rw-r--r-- | Zend/zend_object_handlers.c | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 5b1d3d7377..6eb2764d11 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -3028,7 +3028,7 @@ ZEND_API int zend_u_declare_property_ex(zend_class_entry *ce, zend_uchar type, z property_info.doc_comment = doc_comment; property_info.doc_comment_len = doc_comment_len; - + property_info.ce = ce; zend_u_hash_update(&ce->properties_info, type, name, name_length + 1, &property_info, sizeof(zend_property_info), NULL); diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index c00a68045d..5c0aed777e 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -3318,6 +3318,7 @@ static int zend_constant_ct_subst(znode *result, zval *const_name TSRMLS_DC) return 0; } + void zend_do_fetch_constant(znode *result, znode *constant_container, znode *constant_name, int mode TSRMLS_DC) { switch (mode) { diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c index 266e23817d..6205518e2f 100644 --- a/Zend/zend_object_handlers.c +++ b/Zend/zend_object_handlers.c @@ -221,7 +221,7 @@ ZEND_API struct _zend_property_info *zend_get_property_info(zend_class_entry *ce if (EG(scope) != ce && is_derived_class(ce, EG(scope)) && EG(scope) - && zend_u_hash_quick_find(&EG(scope)->properties_info, Z_TYPE_P(member), Z_UNIVAL_P(member), Z_UNILEN_P(member)+1, h, (void **) &scope_property_info)==SUCCESS + && zend_u_hash_quick_find(&EG(scope)->properties_info, Z_TYPE_P(member), Z_UNIVAL_P(member), Z_UNILEN_P(member)+1, h, (void **) &scope_property_info)==SUCCESS && scope_property_info->flags & ZEND_ACC_PRIVATE) { return scope_property_info; } else if (property_info) { @@ -239,7 +239,7 @@ ZEND_API struct _zend_property_info *zend_get_property_info(zend_class_entry *ce EG(std_property_info).name = Z_UNIVAL_P(member); EG(std_property_info).name_length = Z_UNILEN_P(member); EG(std_property_info).h = h; - EG(std_property_info).ce = ce;; + EG(std_property_info).ce = ce; property_info = &EG(std_property_info); } return property_info; |