clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 18:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.0' into PHP-8.1

Browse Source 
* PHP-8.0:
  Fix GH-8142: Compilation error on cygwin
This commit is contained in:
Christoph M. Becker 2022-03-04 16:21:15 +01:00
commit 4b90eef9cf
No known key found for this signature in database
GPG Key ID: D66C9593118BCCB6
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@ -5,6 +5,10 @@ PHP NEWS
- Intl: - Intl:
. Fixed bug GH-8115 (Can't catch arg type deprecation when instantiating Intl . Fixed bug GH-8115 (Can't catch arg type deprecation when instantiating Intl
classes). (ilutov) classes). (ilutov)
. Fixed bug GH-8142 (Compilation error on cygwin). (David Carlier)
- Pcntl:
. Fixed bug GH-8142 (Compilation error on cygwin). (David Carlier)
- Standard: - Standard:
. Fixed bug GH-8048 (Force macOS to use statfs). (risner) . Fixed bug GH-8048 (Force macOS to use statfs). (risner)

3
ext/intl/config.m4
View File

@ -87,6 +87,9 @@ if test "$PHP_INTL" != "no"; then
PHP_REQUIRE_CXX() PHP_REQUIRE_CXX()
PHP_CXX_COMPILE_STDCXX(11, mandatory, PHP_INTL_STDCXX) PHP_CXX_COMPILE_STDCXX(11, mandatory, PHP_INTL_STDCXX)
PHP_INTL_CXX_FLAGS="$INTL_COMMON_FLAGS $PHP_INTL_STDCXX $ICU_CXXFLAGS" 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 if test "$ext_shared" = "no"; then
PHP_ADD_SOURCES(PHP_EXT_DIR(intl), $PHP_INTL_CXX_SOURCES, $PHP_INTL_CXX_FLAGS) PHP_ADD_SOURCES(PHP_EXT_DIR(intl), $PHP_INTL_CXX_SOURCES, $PHP_INTL_CXX_FLAGS)
else else

2
ext/pcntl/pcntl.c
View File

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