Skip to content

Commit 664b1a3

Browse files
committed
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
2 parents cf31210 + c43fc20 commit 664b1a3

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

ext/intl/idn/idn.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ static void php_intl_idn_to(INTERNAL_FUNCTION_PARAMETERS,
232232
#if defined(__clang__)
233233
# pragma clang diagnostic push
234234
# pragma clang diagnostic ignored "-Wdeprecated-declarations"
235-
#elif ZEND_GCC_VERSION >= 4002
235+
#elif ZEND_GCC_VERSION >= 4008
236236
# pragma GCC diagnostic push
237237
# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
238238
#endif
@@ -243,7 +243,7 @@ static void php_intl_idn_to(INTERNAL_FUNCTION_PARAMETERS,
243243
}
244244
#if defined(__clang__)
245245
# pragma clang diagnostic pop
246-
#elif ZEND_GCC_VERSION >= 4002
246+
#elif ZEND_GCC_VERSION >= 4008
247247
# pragma GCC diagnostic pop
248248
#endif
249249
efree(ustring);

0 commit comments

Comments
 (0)