X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fphp_http_url.c;h=ce09754a91874f44fe6e32f1306cdcaa131610c9;hb=66a434f313d40d89a912e3044ac5d6112d4f0806;hp=4d7629574993e365a6f1bead6cd4004701825103;hpb=a25866b2177031ae8f5142db8a45fd58dad4e161;p=m6w6%2Fext-http

diff --git a/src/php_http_url.c b/src/php_http_url.c
index 4d76295..ce09754 100644
--- a/src/php_http_url.c
+++ b/src/php_http_url.c
@@ -972,9 +972,7 @@ static ZEND_RESULT_CODE parse_gidn_2003(struct parse_state *state, size_t prev_l
 #endif
 
 #if HAVE_UIDNA_IDNTOASCII
-#	if PHP_HTTP_HAVE_LIBICU
-#		include <unicode/uidna.h>
-#	else
+#	if !PHP_HTTP_HAVE_LIBICU
 typedef uint16_t UChar;
 typedef enum { U_ZERO_ERROR = 0 } UErrorCode;
 int32_t uidna_IDNToASCII(const UChar *src, int32_t srcLength, UChar *dest, int32_t destCapacity, int32_t options, void *parseError, UErrorCode *status);
@@ -1003,11 +1001,11 @@ static ZEND_RESULT_CODE parse_uidn_2003(struct parse_state *state)
 		goto error;
 	}
 
-#	if __GNUC__
+#	if __GNUC__ >= 5
 #		pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #	endif
 	ahost_len = uidna_IDNToASCII(uhost_str, uhost_len, ahost_str, 256, 3, NULL, &rc);
-#	if __GNUC__
+#	if __GNUC__ >= 5
 #		pragma GCC diagnostic pop
 #	endif
 
@@ -1034,10 +1032,7 @@ static ZEND_RESULT_CODE parse_uidn_2003(struct parse_state *state)
 }
 #endif
 
-#if HAVE_UIDNA_IDNTOASCII
-#	if PHP_HTTP_HAVE_LIBICU
-#		include <unicode/uidna.h>
-#	endif
+#if PHP_HTTP_HAVE_LIBICU && HAVE_UIDNA_NAMETOASCII_UTF8
 static ZEND_RESULT_CODE parse_uidn_2008(struct parse_state *state)
 {
 	char *host_ptr, *error = NULL, ebuf[64] = {0};
@@ -1194,7 +1189,7 @@ static ZEND_RESULT_CODE parse_idna(struct parse_state *state, size_t len)
 	||	(state->flags & PHP_HTTP_URL_PARSE_TOIDN_2003) != PHP_HTTP_URL_PARSE_TOIDN_2003
 #	endif
 	) {
-#if HAVE_UIDNA_NAMETOASCII_UTF8
+#if PHP_HTTP_HAVE_LIBICU && HAVE_UIDNA_NAMETOASCII_UTF8
 		return parse_uidn_2008(state);
 #elif PHP_HTTP_HAVE_LIBIDN2
 		return parse_gidn_2008(state, len);
@@ -1224,7 +1219,7 @@ static ZEND_RESULT_CODE parse_idna(struct parse_state *state, size_t len)
 	return parse_widn_2003(state);
 #endif
 
-#if HAVE_UIDNA_NAMETOASCII_UTF8
+#if PHP_HTTP_HAVE_LIBICU && HAVE_UIDNA_NAMETOASCII_UTF8
 		return parse_uidn_2008(state);
 #elif PHP_HTTP_HAVE_LIBIDN2
 		return parse_gidn_2008(state, len);