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

* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type"

Author: cjbj

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);															\