Skip to content

Commit d78ffd5

Browse files
committed
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3: Raise minimal GCC version, Test with 4.8 is OK With 4.4: error: #pragma GCC diagnostic not allowed inside functions
2 parents abc5644 + 664b1a3 commit d78ffd5

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
@@ -206,7 +206,7 @@ static void php_intl_idn_to(INTERNAL_FUNCTION_PARAMETERS,
206206
#if defined(__clang__)
207207
# pragma clang diagnostic push
208208
# pragma clang diagnostic ignored "-Wdeprecated-declarations"
209-
#elif ZEND_GCC_VERSION >= 4002
209+
#elif ZEND_GCC_VERSION >= 4008
210210
# pragma GCC diagnostic push
211211
# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
212212
#endif
@@ -217,7 +217,7 @@ static void php_intl_idn_to(INTERNAL_FUNCTION_PARAMETERS,
217217
}
218218
#if defined(__clang__)
219219
# pragma clang diagnostic pop
220-
#elif ZEND_GCC_VERSION >= 4002
220+
#elif ZEND_GCC_VERSION >= 4008
221221
# pragma GCC diagnostic pop
222222
#endif
223223
efree(ustring);

0 commit comments

Comments
 (0)