diff options
author | Tjerk Meesters <datibbaw@php.net> | 2014-10-09 16:55:15 +0800 |
---|---|---|
committer | Tjerk Meesters <datibbaw@php.net> | 2014-10-09 16:55:15 +0800 |
commit | 49078a6598bade43a42fd7bbebac4f4c5a6cd3df (patch) | |
tree | 41f9f459a2ebe7b4311b893a08b00ab9895d0355 /ext/dom/php_dom.h | |
parent | 78156520ae621357abeb100d58f671d675536263 (diff) | |
parent | 72bd28a5da7bd6e9accfc6442a970a3064b8f76d (diff) | |
download | php-git-49078a6598bade43a42fd7bbebac4f4c5a6cd3df.tar.gz |
Merge branch 'PHP-5.6'
Conflicts:
ext/dom/dom_properties.h
ext/dom/nodelist.c
ext/dom/php_dom.c
Diffstat (limited to 'ext/dom/php_dom.h')
-rw-r--r-- | ext/dom/php_dom.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ext/dom/php_dom.h b/ext/dom/php_dom.h index 9162031a90..9f8023f67b 100644 --- a/ext/dom/php_dom.h +++ b/ext/dom/php_dom.h @@ -126,6 +126,9 @@ xmlNode *php_dom_libxml_hash_iter(xmlHashTable *ht, int index); xmlNode *php_dom_libxml_notation_iter(xmlHashTable *ht, int index); zend_object_iterator *php_dom_get_iterator(zend_class_entry *ce, zval *object, int by_ref TSRMLS_DC); int dom_set_doc_classmap(php_libxml_ref_obj *document, zend_class_entry *basece, zend_class_entry *ce TSRMLS_DC); +zval *dom_nodelist_read_dimension(zval *object, zval *offset, int type, zval *rv TSRMLS_DC); +int dom_nodelist_has_dimension(zval *object, zval *member, int check_empty TSRMLS_DC); +static int dom_nodelist_fetch_dimension(xmlNodePtr *itemnode, zval *offset, dom_nnodemap_object *objmap, zval *rv TSRMLS_DC); #define REGISTER_DOM_CLASS(ce, name, parent_ce, funcs, entry) \ INIT_CLASS_ENTRY(ce, name, funcs); \ |