diff options
| author | Christopher Jones <sixd@php.net> | 2013-08-21 15:07:03 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-08-21 15:07:03 -0700 |
| commit | 9895e8bbe62e94633d56340f8d0164c5411130b6 (patch) | |
| tree | 86e0050adcf010be7fea2ad4c4b1129e11b2b9f0 /ext/intl | |
| parent | d85827fb7fc6983de6e58cb7412644dca407d67f (diff) | |
| parent | f38bd22ed2c5f710f72e719d7ab2a41ce30541fc (diff) | |
| download | php-git-9895e8bbe62e94633d56340f8d0164c5411130b6.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type"
Diffstat (limited to 'ext/intl')
| -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); \ |