diff options
author | Remi Collet <remi@remirepo.net> | 2019-09-10 17:38:20 +0200 |
---|---|---|
committer | Remi Collet <remi@remirepo.net> | 2019-09-10 17:38:20 +0200 |
commit | 989d700b06a38ddc54019c4a2554244686a2c807 (patch) | |
tree | c99fab37cf197cdb6411ebfa14e2b14a21413810 /c43fc204b1639a8aa6c6212202def29b3c4cf611.patch | |
parent | c0a009a249ef3a82a8f6ad4ba3a67a412a9e336a (diff) |
v7.3.10RC1
Diffstat (limited to 'c43fc204b1639a8aa6c6212202def29b3c4cf611.patch')
-rw-r--r-- | c43fc204b1639a8aa6c6212202def29b3c4cf611.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/c43fc204b1639a8aa6c6212202def29b3c4cf611.patch b/c43fc204b1639a8aa6c6212202def29b3c4cf611.patch new file mode 100644 index 0000000..c641f80 --- /dev/null +++ b/c43fc204b1639a8aa6c6212202def29b3c4cf611.patch @@ -0,0 +1,32 @@ +From c43fc204b1639a8aa6c6212202def29b3c4cf611 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@php.net> +Date: Tue, 10 Sep 2019 16:28:35 +0200 +Subject: [PATCH] Raise minimal GCC version, Test with 4.8 is OK With 4.4: + error: #pragma GCC diagnostic not allowed inside functions + +--- + ext/intl/idn/idn.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/ext/intl/idn/idn.c b/ext/intl/idn/idn.c +index 60d7b829d84e..96eac77048a0 100644 +--- a/ext/intl/idn/idn.c ++++ b/ext/intl/idn/idn.c +@@ -226,7 +226,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 +@@ -237,7 +237,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); |