diff options
| author | Anatol Belski <ab@php.net> | 2014-10-10 22:51:13 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-10-10 22:51:13 +0200 |
| commit | e1cd0e0a38deb91d24ded68df010b7f6c03d2cb6 (patch) | |
| tree | 19090152884f17ee4d7691ee79462f4a0537d356 /ext/dom/php_dom.h | |
| parent | fe42847799c9fab9476ca6399e25ed0da0cb2d5c (diff) | |
| parent | e33e4b2d8c44fb04afc54f688ed44dce7e8a2e0f (diff) | |
| download | php-git-e1cd0e0a38deb91d24ded68df010b7f6c03d2cb6.tar.gz | |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master: (40 commits)
int to size_t where the underlaying API supports it
use php_socket_t instead of int
fix signed/unsigned mismatch warning
fix compilation warning
Improved specialisation $this variable accessed through IS_UNUSED operand must be IS_OBJECT, so we don't have to check for its type or perform dereference.
Add notes about get_class_entry/get_class_name to UPGRADING
Fix casts in GD
Drop redundant casting code from ext/filter
update NEWS
update NEWS
update NEWS
update NEWS
Added note to UPGRADING regarding 64-bit support in pack()/unpack()
pack(): Use SIZEOF_ZEND_LONG instead of SIZEOF_LONG
Add 64 bit formats to pack() and unpack()
Help to CPU branch predictor
Removed unused EG(orig_error_reporting)
Update get_class_name semantics
Remove Z_OBJ_CLASS_NAME_P
Improved VM stack primitives for fast paths. Slow paths are not inlined anymore.
...
Diffstat (limited to 'ext/dom/php_dom.h')
| -rw-r--r-- | ext/dom/php_dom.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/dom/php_dom.h b/ext/dom/php_dom.h index 9162031a90..02eb2d9509 100644 --- a/ext/dom/php_dom.h +++ b/ext/dom/php_dom.h @@ -126,6 +126,8 @@ 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); #define REGISTER_DOM_CLASS(ce, name, parent_ce, funcs, entry) \ INIT_CLASS_ENTRY(ce, name, funcs); \ |