diff options
| author | Tjerk Meesters <datibbaw@php.net> | 2014-10-09 23:32:19 +0800 |
|---|---|---|
| committer | Tjerk Meesters <datibbaw@php.net> | 2014-10-09 23:32:19 +0800 |
| commit | 0a50b250b2538c3640edb7d8ff07c85472823041 (patch) | |
| tree | 663b25da2f5643d7d75c49a032aab0398d6dd4bf /ext/dom/php_dom.h | |
| parent | 2f099478a3c5509e4063002b3256bde380739e3d (diff) | |
| parent | 59f39dea66f8de4de240eb01b4553644fdc5b8bd (diff) | |
| download | php-git-0a50b250b2538c3640edb7d8ff07c85472823041.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Refactored DOMNodeList array dereferencing implementation
Conflicts:
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 | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ext/dom/php_dom.h b/ext/dom/php_dom.h index 9f8023f67b..02eb2d9509 100644 --- a/ext/dom/php_dom.h +++ b/ext/dom/php_dom.h @@ -128,7 +128,6 @@ zend_object_iterator *php_dom_get_iterator(zend_class_entry *ce, zval *object, i 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); \ |