]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.2' into PHP-7.3
authorSara Golemon <pollita@php.net>
Fri, 16 Aug 2019 16:41:02 +0000 (12:41 -0400)
committerSara Golemon <pollita@php.net>
Fri, 16 Aug 2019 16:41:02 +0000 (12:41 -0400)
* PHP-7.2:
  Suppress deprecation warning on IDNA2003 ICU methods

1  2 
ext/intl/idn/idn.c

index fc83f7921f595ac1ddcb4bd5312e57a98b63bcdd,877a27cbe8a7d2b6746758f08c193222510539a1..5f9a8d11ccf1ef79c7e3ded6e1e0627fbb1f6e18
@@@ -225,10 -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__)
+ # 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 {