archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix GH-8142: Compilation error on cygwin

Browse source 
* pcntl: SIGPOLL/si_band is unsupported
* intl: enable the signal apis with `_POSIX_C_SOURCE`

Closes GH-8146.
This commit is contained in:
David Carlier 2022-02-23 19:41:19 +00:00 • committed by Christoph M. Becker
parent 57ef16bb5d
commit 8b15858c58
No known key found for this signature in database
GPG key ID: D66C9593118BCCB6
3 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
NEWS
View file

@ -2,6 +2,12 @@ PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2022, PHP 8.0.18
- Intl:
. Fixed bug GH-8142 (Compilation error on cygwin). (David Carlier)
- Pcntl:
. Fixed bug GH-8142 (Compilation error on cygwin). (David Carlier)
- Standard:
. Fixed bug GH-8048 (Force macOS to use statfs). (risner)

3
ext/intl/config.m4
View file

@ -85,6 +85,9 @@ if test "$PHP_INTL" != "no"; then
PHP_REQUIRE_CXX()
PHP_CXX_COMPILE_STDCXX(11, mandatory, PHP_INTL_STDCXX)
PHP_INTL_CXX_FLAGS="$INTL_COMMON_FLAGS $PHP_INTL_STDCXX $ICU_CXXFLAGS"
case $host_alias in
*cygwin*) PHP_INTL_CXX_FLAGS="$PHP_INTL_CXX_FLAGS -D_POSIX_C_SOURCE=200809L"
esac
if test "$ext_shared" = "no"; then
PHP_ADD_SOURCES(PHP_EXT_DIR(intl), $PHP_INTL_CXX_SOURCES, $PHP_INTL_CXX_FLAGS)
else

2
ext/pcntl/pcntl.c
View file

@ -1160,7 +1160,7 @@ static void pcntl_siginfo_to_zval(int signo, siginfo_t *siginfo, zval *user_sigi
case SIGBUS:
add_assoc_double_ex(user_siginfo, "addr", sizeof("addr")-1, (zend_long)siginfo->si_addr);
break;
#ifdef SIGPOLL
#if defined(SIGPOLL) && !defined(__CYGWIN__)
case SIGPOLL:
add_assoc_long_ex(user_siginfo, "band", sizeof("band")-1, siginfo->si_band);
# ifdef si_fd