From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Fri, 23 Aug 2019 10:21:57 +0000 (+0200)
Subject: Merge branch 'PHP-7.2' into PHP-7.3
X-Git-Tag: php-7.4.0RC1~59^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c9d31941e4dccc6f139c312578e69909ee7e9df2;p=php

Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Suppress deprecation warning on IDNA2003 ICU methods for clang
---

c9d31941e4dccc6f139c312578e69909ee7e9df2
diff --cc ext/intl/idn/idn.c
index 5f9a8d11cc,60d7b829d8..cb0d0ee8cd
--- a/ext/intl/idn/idn.c
+++ b/ext/intl/idn/idn.c
@@@ -225,11 -221,12 +225,14 @@@ static void php_intl_idn_to(INTERNAL_FU
  		RETURN_FALSE;
  	} else {
  		UParseError parse_error;
 +		UChar       converted[MAXPATHLEN];
 +		int32_t     converted_ret_len;
  
  		status = U_ZERO_ERROR;
- #if (ZEND_GCC_VERSION >= 4002) && !defined(__clang__)
+ #if defined(__clang__)
+ # pragma clang diagnostic push
+ # pragma clang diagnostic ignored "-Wdeprecated-declarations"
+ #elif ZEND_GCC_VERSION >= 4002
  # pragma GCC diagnostic push
  # pragma GCC diagnostic ignored "-Wdeprecated-declarations"
  #endif