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""
jasonlfunk · Aug 22, 2013 · c1ecdfb · c1ecdfb
2 parents 18282f4 + 7109f36
commit c1ecdfb
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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: