changing dom_object_get_data to php_dom_object_get_data and PHP_DOM_EXPORT it

(by Rob Richards)

diff --git a/ext/dom/element.c b/ext/dom/element.c
index 1d59ee2a8c598230c92c9f92d21b833dce888138..84b01618bd439fcc31b11ffd9667e3872dcf31cf 100644 (file)
--- a/ext/dom/element.c
+++ b/ext/dom/element.c
@@ -247,7 +247,7 @@ PHP_FUNCTION(dom_element_remove_attribute)
        }
 
        /*      TODO: DTD defined attributes are handled special */
-       if (dom_object_get_data((xmlNodePtr) attrp) == NULL) {
+       if (php_dom_object_get_data((xmlNodePtr) attrp) == NULL) {
                node_list_unlink(attrp->children TSRMLS_CC);
                xmlUnlinkNode((xmlNodePtr) attrp);
                xmlFreeProp(attrp);
@@ -321,7 +321,7 @@ PHP_FUNCTION(dom_element_set_attribute_node)
 
        existattrp = xmlHasProp(nodep, attrp->name);
        if (existattrp != NULL) {
-               if ((oldobj = dom_object_get_data((xmlNodePtr) existattrp)) != NULL && 
+               if ((oldobj = php_dom_object_get_data((xmlNodePtr) existattrp)) != NULL && 
                        ((php_libxml_node_ptr *)oldobj->ptr)->node == (xmlNodePtr) attrp)
                {
                        RETURN_NULL();
@@ -588,7 +588,7 @@ PHP_FUNCTION(dom_element_remove_attribute_ns)
        }
 
        if (attrp) {
-               if (dom_object_get_data((xmlNodePtr) attrp) == NULL) {
+               if (php_dom_object_get_data((xmlNodePtr) attrp) == NULL) {
                        node_list_unlink(attrp->children TSRMLS_CC);
                        xmlUnlinkNode((xmlNodePtr) attrp);
                        xmlFreeProp(attrp);
@@ -672,7 +672,7 @@ PHP_FUNCTION(dom_element_set_attribute_node_ns)
     }
 
        if (existattrp != NULL) {
-               if ((oldobj = dom_object_get_data((xmlNodePtr) existattrp)) != NULL && 
+               if ((oldobj = php_dom_object_get_data((xmlNodePtr) existattrp)) != NULL && 
                        ((php_libxml_node_ptr *)oldobj->ptr)->node == (xmlNodePtr) attrp)
                {
                        RETURN_NULL();

diff --git a/ext/dom/php_dom.c b/ext/dom/php_dom.c
index 04409f294fd86eecb3a328a46423841883e00376..592ff5736a8a7110e823bbf71e6456480b6f32bc 100644 (file)
--- a/ext/dom/php_dom.c
+++ b/ext/dom/php_dom.c
@@ -160,8 +160,8 @@ xmlNodePtr dom_object_get_node(dom_object *obj)
 }
 /* }}} end dom_object_get_node */
 
-/* {{{ dom_object *dom_object_get_data(xmlNodePtr obj) */
-dom_object *dom_object_get_data(xmlNodePtr obj)
+/* {{{ dom_object *php_dom_object_get_data(xmlNodePtr obj) */
+dom_object *php_dom_object_get_data(xmlNodePtr obj)
 {
        if (obj->_private != NULL) {
                return (dom_object *) ((php_libxml_node_ptr *) obj->_private)->_private;
@@ -169,7 +169,7 @@ dom_object *dom_object_get_data(xmlNodePtr obj)
                return NULL;
        }
 }
-/* }}} end dom_object_get_data */
+/* }}} end php_dom_object_get_data */
 
 /* {{{ dom_read_na */
 static int dom_read_na(dom_object *obj, zval **retval TSRMLS_DC)
@@ -697,7 +697,7 @@ void node_list_unlink(xmlNodePtr node TSRMLS_DC)
 
        while (node != NULL) {
 
-               wrapper = dom_object_get_data(node);
+               wrapper = php_dom_object_get_data(node);
 
                if (wrapper != NULL ) {
                        xmlUnlinkNode(node);
@@ -852,7 +852,7 @@ zval *php_dom_create_object(xmlNodePtr obj, int *found, zval *wrapper_in, zval *
                return wrapper;
        }
 
-       if ((intern = (dom_object *) dom_object_get_data((void *) obj))) {
+       if ((intern = (dom_object *) php_dom_object_get_data((void *) obj))) {
                return_value->type = IS_OBJECT;
                return_value->is_ref = 1;
                return_value->value.obj.handle = intern->handle;

diff --git a/ext/dom/php_dom.h b/ext/dom/php_dom.h
index beeb85f87ca33ca51b8ccf629e4017b9882d6777..1356fccee567d42495e60ddb83aabebab522865d 100644 (file)
--- a/ext/dom/php_dom.h
+++ b/ext/dom/php_dom.h
@@ -36,6 +36,7 @@ extern zend_module_entry dom_module_entry;
 #include <libxml/uri.h>
 #include <libxml/xmlerror.h>
 #include <libxml/xinclude.h>
+#include <libxml/hash.h>
 #if defined(LIBXML_HTML_ENABLED)
 #include <libxml/HTMLparser.h>
 #include <libxml/HTMLtree.h>

diff --git a/ext/dom/xml_common.h b/ext/dom/xml_common.h
index a8990bc33a319e5baa2095ad2411a650042a794e..a9688794772231521bb59fd6eeeecd1eb9a2fccf 100644 (file)
--- a/ext/dom/xml_common.h
+++ b/ext/dom/xml_common.h
@@ -56,9 +56,8 @@ typedef struct _dom_object {
 
 #define PHP_DOM_EXPORT(__type) PHPAPI __type
 
+PHP_DOM_EXPORT(dom_object *) php_dom_object_get_data(xmlNodePtr obj);
 PHP_DOM_EXPORT(zval *) php_dom_create_object(xmlNodePtr obj, int *found, zval *in, zval* return_value, dom_object *domobj TSRMLS_DC);
-PHP_DOM_EXPORT(zval *) dom_read_property(zval *object, zval *member, zend_bool silent TSRMLS_DC);
-PHP_DOM_EXPORT(void) dom_write_property(zval *object, zval *member, zval *value TSRMLS_DC);
 
 #define DOM_XMLNS_NAMESPACE \
     (const xmlChar *) "http://www.w3.org/2000/xmlns/"