diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-08-23 12:21:57 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-08-23 12:21:57 +0200 |
| commit | c9d31941e4dccc6f139c312578e69909ee7e9df2 (patch) | |
| tree | 3aa9962a31f8998c6c71405f09073d6769b9d20b | |
| parent | 310708845ff02b9e252b7a02616290384dd846ba (diff) | |
| parent | ff7029b65b43578781abd8c767efa4a90b296351 (diff) | |
| download | php-git-c9d31941e4dccc6f139c312578e69909ee7e9df2.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Suppress deprecation warning on IDNA2003 ICU methods for clang
| -rw-r--r-- | ext/intl/idn/idn.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/ext/intl/idn/idn.c b/ext/intl/idn/idn.c index 5f9a8d11cc..cb0d0ee8cd 100644 --- a/ext/intl/idn/idn.c +++ b/ext/intl/idn/idn.c @@ -229,7 +229,10 @@ static void php_intl_idn_to(INTERNAL_FUNCTION_PARAMETERS, 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 @@ -238,7 +241,9 @@ static void php_intl_idn_to(INTERNAL_FUNCTION_PARAMETERS, } else { converted_ret_len = uidna_IDNToUnicode(ustring, ustring_len, converted, MAXPATHLEN, (int32_t)option, &parse_error, &status); } -#if (ZEND_GCC_VERSION >= 4002) && !defined(__clang__) +#if defined(__clang__) +# pragma clang diagnostic pop +#elif ZEND_GCC_VERSION >= 4002 # pragma GCC diagnostic pop #endif efree(ustring); |