diff options
| author | Remi Collet <remi@php.net> | 2019-09-10 16:29:30 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2019-09-10 16:29:30 +0200 |
| commit | 664b1a3f57fd5b503dec1c8373333a909f733bba (patch) | |
| tree | c08ff8847266867e5ce98fb53d2796603f6566ad | |
| parent | cf31210f29cb8fd5d0549f954984d1b55046dcf3 (diff) | |
| parent | c43fc204b1639a8aa6c6212202def29b3c4cf611 (diff) | |
| download | php-git-664b1a3f57fd5b503dec1c8373333a909f733bba.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Raise minimal GCC version, Test with 4.8 is OK With 4.4: error: #pragma GCC diagnostic not allowed inside functions
| -rw-r--r-- | ext/intl/idn/idn.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/intl/idn/idn.c b/ext/intl/idn/idn.c index cb0d0ee8cd..31ff401599 100644 --- a/ext/intl/idn/idn.c +++ b/ext/intl/idn/idn.c @@ -232,7 +232,7 @@ static void php_intl_idn_to(INTERNAL_FUNCTION_PARAMETERS, #if defined(__clang__) # pragma clang diagnostic push # pragma clang diagnostic ignored "-Wdeprecated-declarations" -#elif ZEND_GCC_VERSION >= 4002 +#elif ZEND_GCC_VERSION >= 4008 # pragma GCC diagnostic push # pragma GCC diagnostic ignored "-Wdeprecated-declarations" #endif @@ -243,7 +243,7 @@ static void php_intl_idn_to(INTERNAL_FUNCTION_PARAMETERS, } #if defined(__clang__) # pragma clang diagnostic pop -#elif ZEND_GCC_VERSION >= 4002 +#elif ZEND_GCC_VERSION >= 4008 # pragma GCC diagnostic pop #endif efree(ustring); |