From f2ceb4963e1ecce4535d3a9b1e3dfa6960aff2c6 Mon Sep 17 00:00:00 2001 From: Christopher Jones Date: Thu, 22 Aug 2013 08:58:24 -0700 Subject: [PATCH 1/2] =?UTF-8?q?Revert=20"Suppress=20compliation=20warning?= =?UTF-8?q?=20"warning:=20passing=20argument=201=20of=20=E2=80=98=5Fefree?= =?UTF-8?q?=E2=80=99=20discards=20qualifiers=20from=20pointer=20target=20t?= =?UTF-8?q?ype""?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit f38bd22ed2c5f710f72e719d7ab2a41ce30541fc. --- ext/intl/intl_data.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/intl/intl_data.h b/ext/intl/intl_data.h index 6966dc28910..66ca27ae796 100644 --- a/ext/intl/intl_data.h +++ b/ext/intl/intl_data.h @@ -79,7 +79,7 @@ typedef struct _intl_data { int u8len; \ intl_convert_utf16_to_utf8(&u8value, &u8len, ustring, ulen, &INTL_DATA_ERROR_CODE((obj))); \ if((free_it)) { \ - efree((void *)ustring); \ + efree(ustring); \ } \ INTL_METHOD_CHECK_STATUS((obj), "Error converting value to UTF-8"); \ RETVAL_STRINGL(u8value, u8len, 0); \ From 7109f369e848384444a852cd0f0c591fd58a1bc4 Mon Sep 17 00:00:00 2001 From: Christopher Jones Date: Thu, 22 Aug 2013 09:05:52 -0700 Subject: [PATCH 2/2] =?UTF-8?q?Suppress=20compliation=20warning=20"warning?= =?UTF-8?q?:=20passing=20argument=201=20of=20=E2=80=98=5Fefree=E2=80=99=20?= =?UTF-8?q?discards=20qualifiers=20from=20pointer=20target=20type"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ext/intl/resourcebundle/resourcebundle.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/intl/resourcebundle/resourcebundle.c b/ext/intl/resourcebundle/resourcebundle.c index 6d39dfb7e08..f5475faf1c5 100644 --- a/ext/intl/resourcebundle/resourcebundle.c +++ b/ext/intl/resourcebundle/resourcebundle.c @@ -41,7 +41,7 @@ void resourcebundle_extract_value( zval *return_value, ResourceBundle_object *so case URES_STRING: ufield = ures_getString( source->child, &ilen, &INTL_DATA_ERROR_CODE(source) ); INTL_METHOD_CHECK_STATUS(source, "Failed to retrieve string value"); - INTL_METHOD_RETVAL_UTF8(source, ufield, ilen, 0); + INTL_METHOD_RETVAL_UTF8(source, (UChar *)ufield, ilen, 0); break; case URES_BINARY: