summaryrefslogtreecommitdiff
path: root/ext/simplexml/php_simplexml.h
diff options
context:
space:
mode:
authorkrakjoe <joe.watkins@live.co.uk>2014-05-05 22:45:29 +0100
committerkrakjoe <joe.watkins@live.co.uk>2014-05-05 22:45:29 +0100
commitd7c529ed327cca4fad2c42fe74fabc367f24dc5b (patch)
tree919d9e6800c6244436ddce9d09d707922fd859a4 /ext/simplexml/php_simplexml.h
parent875c48ae679158cb2194c4e277810883e0b21768 (diff)
parent211d32c81429730e2692c65577d021616a525726 (diff)
downloadphp-git-d7c529ed327cca4fad2c42fe74fabc367f24dc5b.tar.gz
Merge branch 'phpng' of git.php.net:php-src into phpng
Diffstat (limited to 'ext/simplexml/php_simplexml.h')
-rw-r--r--ext/simplexml/php_simplexml.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/simplexml/php_simplexml.h b/ext/simplexml/php_simplexml.h
index 7314d8c825..b908e4c722 100644
--- a/ext/simplexml/php_simplexml.h
+++ b/ext/simplexml/php_simplexml.h
@@ -55,7 +55,6 @@ typedef enum {
} SXE_ITER;
typedef struct {
- zend_object zo;
php_libxml_node_ptr *node;
php_libxml_ref_obj *document;
HashTable *properties;
@@ -65,10 +64,11 @@ typedef struct {
xmlChar *nsprefix;
int isprefix;
SXE_ITER type;
- zval *data;
+ zval data;
} iter;
- zval *tmp;
+ zval tmp;
zend_function *fptr_count;
+ zend_object zo;
} php_sxe_object;
#ifdef ZTS