diff options
| author | krakjoe <joe.watkins@live.co.uk> | 2014-05-05 22:45:29 +0100 |
|---|---|---|
| committer | krakjoe <joe.watkins@live.co.uk> | 2014-05-05 22:45:29 +0100 |
| commit | d7c529ed327cca4fad2c42fe74fabc367f24dc5b (patch) | |
| tree | 919d9e6800c6244436ddce9d09d707922fd859a4 /ext/xml/php_xml.h | |
| parent | 875c48ae679158cb2194c4e277810883e0b21768 (diff) | |
| parent | 211d32c81429730e2692c65577d021616a525726 (diff) | |
| download | php-git-d7c529ed327cca4fad2c42fe74fabc367f24dc5b.tar.gz | |
Merge branch 'phpng' of git.php.net:php-src into phpng
Diffstat (limited to 'ext/xml/php_xml.h')
| -rw-r--r-- | ext/xml/php_xml.h | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/ext/xml/php_xml.h b/ext/xml/php_xml.h index 0fc25739c4..0195bb5836 100644 --- a/ext/xml/php_xml.h +++ b/ext/xml/php_xml.h @@ -44,22 +44,22 @@ ZEND_BEGIN_MODULE_GLOBALS(xml) ZEND_END_MODULE_GLOBALS(xml) typedef struct { - int index; int case_folding; XML_Parser parser; XML_Char *target_encoding; - zval *startElementHandler; - zval *endElementHandler; - zval *characterDataHandler; - zval *processingInstructionHandler; - zval *defaultHandler; - zval *unparsedEntityDeclHandler; - zval *notationDeclHandler; - zval *externalEntityRefHandler; - zval *unknownEncodingHandler; - zval *startNamespaceDeclHandler; - zval *endNamespaceDeclHandler; + zval index; + zval startElementHandler; + zval endElementHandler; + zval characterDataHandler; + zval processingInstructionHandler; + zval defaultHandler; + zval unparsedEntityDeclHandler; + zval notationDeclHandler; + zval externalEntityRefHandler; + zval unknownEncodingHandler; + zval startNamespaceDeclHandler; + zval endNamespaceDeclHandler; zend_function *startElementPtr; zend_function *endElementPtr; @@ -73,14 +73,14 @@ typedef struct { zend_function *startNamespaceDeclPtr; zend_function *endNamespaceDeclPtr; - zval *object; + zval object; - zval *data; - zval *info; + zval data; + zval info; int level; int toffset; int curtag; - zval **ctag; + zval *ctag; char **ltags; int lastwasopen; int skipwhite; @@ -133,9 +133,9 @@ PHP_FUNCTION(utf8_encode); PHP_FUNCTION(utf8_decode); PHP_FUNCTION(xml_parse_into_struct); -PHPAPI char *_xml_zval_strdup(zval *val); -PHPAPI char *xml_utf8_decode(const XML_Char *, int, int *, const XML_Char *); -PHPAPI char *xml_utf8_encode(const char *s, int len, int *newlen, const XML_Char *encoding); +PHPAPI char *_xml_zval_strdup(zval *); +PHPAPI zend_string *xml_utf8_decode(const XML_Char *, int, const XML_Char *); +PHPAPI zend_string *xml_utf8_encode(const char *, int, const XML_Char *); #endif /* HAVE_LIBEXPAT */ |