cvs: php-src /ext/libxml php_libxml.h

rrichards Wed Jul 19 18:28:30 2006 UTC Modified files: /php-src/ext/libxml php_libxml.h Log: add unicode compatible macros for returning strings from xml based extensions http://cvs.php.net/viewvc.cgi/php-src/ext/libxml/php_libxml.h?r1=1.19&r2=1.20&diff_format=u Index: php-src/ext/libxml/php_libxml.h diff -u php-src/ext/libxml/php_libxml.h:1.19 php-src/ext/libxml/php_libxml.h:1.20 --- php-src/ext/libxml/php_libxml.h:1.19 Tue Jun 13 13:12:18 2006 +++ php-src/ext/libxml/php_libxml.h Wed Jul 19 18:28:30 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_libxml.h,v 1.19 2006/06/13 13:12:18 dmitry Exp $ */ +/* $Id: php_libxml.h,v 1.20 2006/07/19 18:28:30 rrichards Exp $ */ #ifndef PHP_LIBXML_H #define PHP_LIBXML_H @@ -102,6 +102,16 @@ PHP_LIBXML_API void php_libxml_initialize(); PHP_LIBXML_API void php_libxml_shutdown(); +#define ZVAL_XML_STRING(z, s, flags) { \ + UConverter *libxml_utf_conv = NULL; \ + if (UG(unicode)) { \ + libxml_utf_conv = UG(utf8_conv); \ + } \ + ZVAL_U_STRING(libxml_utf_conv, z, s, flags); \ +} + +#define RETVAL_XML_STRING(s, flags) ZVAL_XML_STRING(return_value, s, flags) + #ifdef ZTS #define LIBXML(v) TSRMG(libxml_globals_id, zend_libxml_globals *, v) #else