Skip to content

Commit ea62b80

Browse files
committed
Merge branch 'PHP-8.1'
* PHP-8.1: Fix GH-8142: Compilation error on cygwin
2 parents 2384c23 + 4b90eef commit ea62b80

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

ext/intl/config.m4

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,9 @@ if test "$PHP_INTL" != "no"; then
8787
PHP_REQUIRE_CXX()
8888
PHP_CXX_COMPILE_STDCXX(11, mandatory, PHP_INTL_STDCXX)
8989
PHP_INTL_CXX_FLAGS="$INTL_COMMON_FLAGS $PHP_INTL_STDCXX $ICU_CXXFLAGS"
90+
case $host_alias in
91+
*cygwin*) PHP_INTL_CXX_FLAGS="$PHP_INTL_CXX_FLAGS -D_POSIX_C_SOURCE=200809L"
92+
esac
9093
if test "$ext_shared" = "no"; then
9194
PHP_ADD_SOURCES(PHP_EXT_DIR(intl), $PHP_INTL_CXX_SOURCES, $PHP_INTL_CXX_FLAGS)
9295
else

ext/pcntl/pcntl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1224,7 +1224,7 @@ static void pcntl_siginfo_to_zval(int signo, siginfo_t *siginfo, zval *user_sigi
12241224
case SIGBUS:
12251225
add_assoc_double_ex(user_siginfo, "addr", sizeof("addr")-1, (zend_long)siginfo->si_addr);
12261226
break;
1227-
#ifdef SIGPOLL
1227+
#if defined(SIGPOLL) && !defined(__CYGWIN__)
12281228
case SIGPOLL:
12291229
add_assoc_long_ex(user_siginfo, "band", sizeof("band")-1, siginfo->si_band);
12301230
# ifdef si_fd

0 commit comments

Comments
 (0)