mirror of
https://github.com/php/php-src.git
synced 2025-08-16 05:58:45 +02:00
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""
This commit is contained in:
commit
c1ecdfbf6e
1 changed files with 1 additions and 1 deletions
|
@ -41,7 +41,7 @@ void resourcebundle_extract_value( zval *return_value, ResourceBundle_object *so
|
||||||
case URES_STRING:
|
case URES_STRING:
|
||||||
ufield = ures_getString( source->child, &ilen, &INTL_DATA_ERROR_CODE(source) );
|
ufield = ures_getString( source->child, &ilen, &INTL_DATA_ERROR_CODE(source) );
|
||||||
INTL_METHOD_CHECK_STATUS(source, "Failed to retrieve string value");
|
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;
|
break;
|
||||||
|
|
||||||
case URES_BINARY:
|
case URES_BINARY:
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue