diff options
Diffstat (limited to 'ext/dom/php_dom.h')
| -rw-r--r-- | ext/dom/php_dom.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ext/dom/php_dom.h b/ext/dom/php_dom.h index e0de45b0d3..b38c402dfe 100644 --- a/ext/dom/php_dom.h +++ b/ext/dom/php_dom.h @@ -72,7 +72,7 @@ typedef struct _dom_xpath_object { void *ptr; php_libxml_ref_obj *document; HashTable *prop_handler; - zend_object_handle handle; + //??? zend_object_handle handle; int registerPhpFunctions; HashTable *registered_phpfunctions; HashTable *node_list; @@ -96,10 +96,10 @@ typedef struct { dom_object *dom_object_get_data(xmlNodePtr obj); dom_doc_propsptr dom_get_doc_props(php_libxml_ref_obj *document); -zend_object_value dom_objects_new(zend_class_entry *class_type TSRMLS_DC); -zend_object_value dom_nnodemap_objects_new(zend_class_entry *class_type TSRMLS_DC); +zend_object *dom_objects_new(zend_class_entry *class_type TSRMLS_DC); +zend_object *dom_nnodemap_objects_new(zend_class_entry *class_type TSRMLS_DC); #if defined(LIBXML_XPATH_ENABLED) -zend_object_value dom_xpath_objects_new(zend_class_entry *class_type TSRMLS_DC); +zend_object *dom_xpath_objects_new(zend_class_entry *class_type TSRMLS_DC); #endif int dom_get_strict_error(php_libxml_ref_obj *document); void php_dom_throw_error(int error_code, int strict_error TSRMLS_DC); @@ -111,7 +111,7 @@ void dom_set_old_ns(xmlDoc *doc, xmlNs *ns); xmlNsPtr dom_get_nsdecl(xmlNode *node, xmlChar *localName); void dom_normalize (xmlNodePtr nodep TSRMLS_DC); xmlNode *dom_get_elements_by_tag_name_ns_raw(xmlNodePtr nodep, char *ns, char *local, int *cur, int index); -void php_dom_create_implementation(zval **retval TSRMLS_DC); +void php_dom_create_implementation(zval *retval TSRMLS_DC); int dom_hierarchy(xmlNodePtr parent, xmlNodePtr child); int dom_has_feature(char *feature, char *version); int dom_node_is_read_only(xmlNodePtr node); @@ -130,9 +130,9 @@ ce.create_object = dom_objects_new; \ entry = zend_register_internal_class_ex(&ce, parent_ce TSRMLS_CC); #define DOM_GET_OBJ(__ptr, __id, __prtype, __intern) { \ - __intern = (dom_object *)zend_object_store_get_object(__id TSRMLS_CC); \ + __intern = Z_DOMOBJ_P(__id); \ if (__intern->ptr == NULL || !(__ptr = (__prtype)((php_libxml_node_ptr *)__intern->ptr)->node)) { \ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't fetch %s", __intern->std.ce->name);\ + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't fetch %s", __intern->std.ce->name->val);\ RETURN_NULL();\ } \ } |