diff options
| author | Felipe Pena <felipe@php.net> | 2009-03-26 20:02:53 +0000 |
|---|---|---|
| committer | Felipe Pena <felipe@php.net> | 2009-03-26 20:02:53 +0000 |
| commit | 8ecf8ede1ff9cd425cf1cfd754558ff4bd2d38f4 (patch) | |
| tree | 8d447a97971dd7d300621a52f491906cb1e7d576 /ext/libxml/php_libxml.h | |
| parent | 5d8cf0217f3a45d297f63f726774fb94b7f1353d (diff) | |
| download | php-git-8ecf8ede1ff9cd425cf1cfd754558ff4bd2d38f4.tar.gz | |
- Removed:
- UG(unicode) checks
- pcre_cache_entry.unicode_mode
- Changed:
- ZEND_STR_TYPE -> IS_UNICODE
- convert_to_text -> convert_to_unicode
- convert_to_text_ex -> convert_to_unicode_ex
(Felipe, Steph)
Diffstat (limited to 'ext/libxml/php_libxml.h')
| -rw-r--r-- | ext/libxml/php_libxml.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/ext/libxml/php_libxml.h b/ext/libxml/php_libxml.h index 60234483cd..a02cc54aff 100644 --- a/ext/libxml/php_libxml.h +++ b/ext/libxml/php_libxml.h @@ -103,17 +103,13 @@ PHP_LIBXML_API void php_libxml_shutdown(void); #define ZVAL_XML_STRING(z, s, flags) { \ UConverter *libxml_utf_conv = NULL; \ - if (UG(unicode)) { \ - libxml_utf_conv = UG(utf8_conv); \ - } \ + libxml_utf_conv = UG(utf8_conv); \ 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); \ - } \ + libxml_utf_conv = UG(utf8_conv); \ ZVAL_U_STRINGL(libxml_utf_conv, z, s, l, flags); \ } |