diff options
| author | Christopher Jones <sixd@php.net> | 2013-08-20 10:42:20 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-08-20 10:42:20 -0700 |
| commit | 0ab8475db2fe3eb9b2f382cda77171be1e66793a (patch) | |
| tree | 2d65bba734f8f0453454f445550175f5d6fd0f07 /ext/xml/xml.c | |
| parent | 7160adf4ad9016dcda945f8697a599acf240163b (diff) | |
| parent | d82f9339fee1795f26498539b5276c7bdd654658 (diff) | |
| download | php-git-0ab8475db2fe3eb9b2f382cda77171be1e66793a.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Eliminate compiler warnings: "warning: pointer targets in initialization differ in signedness"
Eliminate compiler warnings "warning: pointer targets in initialization differ in signedness"
Diffstat (limited to 'ext/xml/xml.c')
| -rw-r--r-- | ext/xml/xml.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/xml/xml.c b/ext/xml/xml.c index 334938ab24..1ef01c8864 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -274,10 +274,10 @@ zend_module_entry xml_module_entry = { * the encoding is currently done internally by expat/xmltok. */ xml_encoding xml_encodings[] = { - { "ISO-8859-1", xml_decode_iso_8859_1, xml_encode_iso_8859_1 }, - { "US-ASCII", xml_decode_us_ascii, xml_encode_us_ascii }, - { "UTF-8", NULL, NULL }, - { NULL, NULL, NULL } + { (XML_Char *)"ISO-8859-1", xml_decode_iso_8859_1, xml_encode_iso_8859_1 }, + { (XML_Char *)"US-ASCII", xml_decode_us_ascii, xml_encode_us_ascii }, + { (XML_Char *)"UTF-8", NULL, NULL }, + { (XML_Char *)NULL, NULL, NULL } }; static XML_Memory_Handling_Suite php_xml_mem_hdlrs; |