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

rrichards Tue Aug 8 20:42:38 2006 UTC Modified files: /php-src/ext/libxml php_libxml.h Log: additional unicode/xml macros http://cvs.php.net/viewvc.cgi/php-src/ext/libxml/php_libxml.h?r1=1.20&r2=1.21&diff_format=u Index: php-src/ext/libxml/php_libxml.h diff -u php-src/ext/libxml/php_libxml.h:1.20 php-src/ext/libxml/php_libxml.h:1.21 --- php-src/ext/libxml/php_libxml.h:1.20 Wed Jul 19 18:28:30 2006 +++ php-src/ext/libxml/php_libxml.h Tue Aug 8 20:42:38 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_libxml.h,v 1.20 2006/07/19 18:28:30 rrichards Exp $ */ +/* $Id: php_libxml.h,v 1.21 2006/08/08 20:42:38 rrichards Exp $ */ #ifndef PHP_LIBXML_H #define PHP_LIBXML_H @@ -110,7 +110,16 @@ ZVAL_U_STRING(libxml_utf_conv, z, s, flags); \ } +#define ZVAL_XML_STRING_LEN(z, s, l, flags) { \ + UConverter *libxml_utf_conv = NULL; \ + if (UG(unicode)) { \ + libxml_utf_conv = UG(utf8_conv); \ + } \ + ZVAL_U_STRINGL(libxml_utf_conv, z, s, l, flags); \ +} + #define RETVAL_XML_STRING(s, flags) ZVAL_XML_STRING(return_value, s, flags) +#define RETVAL_XML_STRING_LEN(s, l, flags) ZVAL_XML_STRING_LEN(return_value, s, l, flags) #ifdef ZTS #define LIBXML(v) TSRMG(libxml_globals_id, zend_libxml_globals *, v)