Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into…

… PHP-5.5 * 'PHP-5.5' of https://git.php.net/repository/php-src: Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type"
jasonlfunk · Aug 21, 2013 · d2a2e94 · d2a2e94
2 parents d85827f + 9895e8b
commit d2a2e94
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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);															\