diff options
| author | Nikita Popov <nikic@php.net> | 2014-04-16 16:57:05 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2014-04-16 17:14:34 +0200 |
| commit | 59f6d189c8c6a2a11574b5b4ce98e0e8b6a7bc0b (patch) | |
| tree | 5267e39554697460850865247c8878412a9088a6 /ext/dom/php_dom.h | |
| parent | 39d12294fd2483c4634c16fb54cfe5d8e3356ecf (diff) | |
| download | php-git-59f6d189c8c6a2a11574b5b4ce98e0e8b6a7bc0b.tar.gz | |
Fix remaining XPath issue
Diffstat (limited to 'ext/dom/php_dom.h')
| -rw-r--r-- | ext/dom/php_dom.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/ext/dom/php_dom.h b/ext/dom/php_dom.h index 82ba681ff8..628a19e978 100644 --- a/ext/dom/php_dom.h +++ b/ext/dom/php_dom.h @@ -68,17 +68,15 @@ extern zend_module_entry dom_module_entry; #define DOM_NODESET XML_XINCLUDE_START typedef struct _dom_xpath_object { - void *ptr; - php_libxml_ref_obj *document; - HashTable *prop_handler; int registerPhpFunctions; HashTable *registered_phpfunctions; HashTable *node_list; - zend_object std; + dom_object dom; } dom_xpath_object; static inline dom_xpath_object *php_xpath_obj_from_obj(zend_object *obj) { - return (dom_xpath_object*)((char*)(obj) - XtOffsetOf(dom_xpath_object, std)); + return (dom_xpath_object*)((char*)(obj) + - XtOffsetOf(dom_xpath_object, dom) - XtOffsetOf(dom_object, std)); } #define Z_XPATHOBJ_P(zv) php_xpath_obj_from_obj(Z_OBJ_P((zv))) |