Skip to content

Commit 4b90eef

Browse files
committed
Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0: Fix GH-8142: Compilation error on cygwin
2 parents 81048b9 + 8b15858 commit 4b90eef

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

NEWS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ PHP NEWS
55
- Intl:
66
. Fixed bug GH-8115 (Can't catch arg type deprecation when instantiating Intl
77
classes). (ilutov)
8+
. Fixed bug GH-8142 (Compilation error on cygwin). (David Carlier)
9+
10+
- Pcntl:
11+
. Fixed bug GH-8142 (Compilation error on cygwin). (David Carlier)
812

913
- Standard:
1014
. Fixed bug GH-8048 (Force macOS to use statfs). (risner)

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
@@ -1193,7 +1193,7 @@ static void pcntl_siginfo_to_zval(int signo, siginfo_t *siginfo, zval *user_sigi
11931193
case SIGBUS:
11941194
add_assoc_double_ex(user_siginfo, "addr", sizeof("addr")-1, (zend_long)siginfo->si_addr);
11951195
break;
1196-
#ifdef SIGPOLL
1196+
#if defined(SIGPOLL) && !defined(__CYGWIN__)
11971197
case SIGPOLL:
11981198
add_assoc_long_ex(user_siginfo, "band", sizeof("band")-1, siginfo->si_band);
11991199
# ifdef si_fd

0 commit comments

Comments
 (0)