diff options
| author | Christopher Jones <sixd@php.net> | 2013-08-22 09:06:43 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-08-22 09:06:43 -0700 |
| commit | c1ecdfbf6ec6d3d7962d66ab3cbbfd21b2ac9685 (patch) | |
| tree | ab10683d9881f58e0ea2c2813e09dc8ab5539ae7 /ext/intl | |
| parent | 18282f42c5d39e6b1790dfa7b2e18becc21d2f23 (diff) | |
| parent | 7109f369e848384444a852cd0f0c591fd58a1bc4 (diff) | |
| download | php-git-c1ecdfbf6ec6d3d7962d66ab3cbbfd21b2ac9685.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"
Revert "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/resourcebundle/resourcebundle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/intl/resourcebundle/resourcebundle.c b/ext/intl/resourcebundle/resourcebundle.c index 6d39dfb7e0..f5475faf1c 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: |