diff options
| author | Sara Golemon <pollita@php.net> | 2019-08-16 12:41:02 -0400 |
|---|---|---|
| committer | Sara Golemon <pollita@php.net> | 2019-08-16 12:41:02 -0400 |
| commit | a192499d2a3806bf55aa060539b5ce8580aa5db7 (patch) | |
| tree | dd0881fc36739c63c3a63bff76ef87530d5299e5 | |
| parent | 9b9814fa774eb9e4b8c51721324e708e2b1aa30e (diff) | |
| parent | 725f439778a6397267fbb4e88059d704cccbc7f3 (diff) | |
| download | php-git-a192499d2a3806bf55aa060539b5ce8580aa5db7.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Suppress deprecation warning on IDNA2003 ICU methods
| -rw-r--r-- | ext/intl/idn/idn.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/ext/intl/idn/idn.c b/ext/intl/idn/idn.c index fc83f7921f..5f9a8d11cc 100644 --- a/ext/intl/idn/idn.c +++ b/ext/intl/idn/idn.c @@ -229,11 +229,18 @@ 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__) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif if (mode == INTL_IDN_TO_ASCII) { converted_ret_len = uidna_IDNToASCII(ustring, ustring_len, converted, MAXPATHLEN, (int32_t)option, &parse_error, &status); } else { converted_ret_len = uidna_IDNToUnicode(ustring, ustring_len, converted, MAXPATHLEN, (int32_t)option, &parse_error, &status); } +#if (ZEND_GCC_VERSION >= 4002) && !defined(__clang__) +# pragma GCC diagnostic pop +#endif efree(ustring); if (U_FAILURE(status)) { |