archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-17 14:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.3' into PHP-7.4

Browse source 
* PHP-7.3:
  Raise minimal GCC version, Test with 4.8 is OK With 4.4: error: #pragma GCC diagnostic not allowed inside functions
This commit is contained in:
Remi Collet 2019-09-10 16:29:44 +02:00
commit d78ffd54ef
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ext/intl/idn/idn.c
View file

@ -206,7 +206,7 @@ static void php_intl_idn_to(INTERNAL_FUNCTION_PARAMETERS,
#if defined(__clang__) #if defined(__clang__)
# pragma clang diagnostic push # pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wdeprecated-declarations" # pragma clang diagnostic ignored "-Wdeprecated-declarations"
#elif ZEND_GCC_VERSION >= 4002 #elif ZEND_GCC_VERSION >= 4008
# pragma GCC diagnostic push # pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wdeprecated-declarations" # pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif #endif
@ -217,7 +217,7 @@ static void php_intl_idn_to(INTERNAL_FUNCTION_PARAMETERS,
} }
#if defined(__clang__) #if defined(__clang__)
# pragma clang diagnostic pop # pragma clang diagnostic pop
#elif ZEND_GCC_VERSION >= 4002 #elif ZEND_GCC_VERSION >= 4008
# pragma GCC diagnostic pop # pragma GCC diagnostic pop
#endif #endif
efree(ustring); efree(ustring);