diff options
Diffstat (limited to 'ext/xml/php_xml.h')
| -rw-r--r-- | ext/xml/php_xml.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ext/xml/php_xml.h b/ext/xml/php_xml.h index cb6dc0735..2168c5e4b 100644 --- a/ext/xml/php_xml.h +++ b/ext/xml/php_xml.h @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_xml.h,v 1.28.2.2 2006/01/01 12:50:16 sniper Exp $ */ +/* $Id: php_xml.h,v 1.28.2.2.2.2 2006/08/02 15:21:54 iliaa Exp $ */ #ifndef PHP_XML_H #define PHP_XML_H @@ -45,9 +45,9 @@ extern zend_module_entry xml_module_entry; #error "UTF-16 Unicode support not implemented!" #endif -typedef struct { +ZEND_BEGIN_MODULE_GLOBALS(xml) XML_Char *default_encoding; -} php_xml_globals; +ZEND_END_MODULE_GLOBALS(xml) typedef struct { int index; @@ -141,13 +141,14 @@ 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); #endif /* HAVE_LIBEXPAT */ #define phpext_xml_ptr xml_module_ptr #ifdef ZTS -#define XML(v) TSRMG(xml_globals_id, php_xml_globals *, v) +#define XML(v) TSRMG(xml_globals_id, zend_xml_globals *, v) #else #define XML(v) (xml_globals.v) #endif |