diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-08-23 12:22:28 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-08-23 12:22:28 +0200 |
| commit | eeb910911d914ca44271e9dbd2def5dadb466528 (patch) | |
| tree | 1677dea81f05e1fb4f4344328640fedb71bef702 | |
| parent | ca265eb54510ff9513abf37a05e40de0a8a50789 (diff) | |
| parent | c9d31941e4dccc6f139c312578e69909ee7e9df2 (diff) | |
| download | php-git-eeb910911d914ca44271e9dbd2def5dadb466528.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
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 c7b88083bc..a97f6a750f 100644 --- a/ext/intl/idn/idn.c +++ b/ext/intl/idn/idn.c @@ -203,7 +203,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 @@ -212,7 +215,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); |