diff options
| author | Christopher Jones <sixd@php.net> | 2013-08-21 15:23:48 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-08-21 15:23:48 -0700 |
| commit | d0bede2efa5b1801e3eb60c707e47bb4d90d3a92 (patch) | |
| tree | df87400cf6b4cdff4e7b287cd2dbd5055a45c2cd | |
| parent | d8023d13eb5c5c611a17b183b28c0a81233d8a1a (diff) | |
| parent | f38bd22ed2c5f710f72e719d7ab2a41ce30541fc (diff) | |
| download | php-git-d0bede2efa5b1801e3eb60c707e47bb4d90d3a92.tar.gz | |
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
* 'PHP-5.4' of https://git.php.net/repository/php-src:
Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type"
| -rw-r--r-- | ext/intl/intl_data.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/intl/intl_data.h b/ext/intl/intl_data.h index 66ca27ae79..6966dc2891 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(ustring); \ + efree((void *)ustring); \ } \ INTL_METHOD_CHECK_STATUS((obj), "Error converting value to UTF-8"); \ RETVAL_STRINGL(u8value, u8len, 0); \ |