Skip to content

Commit 5017240

Browse files
committed
Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0: Fix pcntl Haiku build
2 parents ee9a3fa + e33de9d commit 5017240

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

NEWS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ PHP NEWS
3131
. Fixed bug #79589 (error:14095126:SSL routines:ssl3_read_n:unexpected eof
3232
while reading). (Jakub Zelenka)
3333

34+
- Pcntl:
35+
. Fixed Haiku build. (David Carlier)
36+
3437
- Soap:
3538
. Fixed bug GH-8578 (Error on wrong parameter on SoapHeader constructor).
3639
(robertnisipeanu)

ext/pcntl/pcntl.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,9 @@ void php_register_signal_constants(INIT_FUNC_ARGS)
148148
#ifdef SIGPOLL
149149
REGISTER_LONG_CONSTANT("SIGPOLL", (zend_long) SIGPOLL, CONST_CS | CONST_PERSISTENT);
150150
#endif
151+
#ifdef SIGIO
151152
REGISTER_LONG_CONSTANT("SIGIO", (zend_long) SIGIO, CONST_CS | CONST_PERSISTENT);
153+
#endif
152154
#ifdef SIGPWR
153155
REGISTER_LONG_CONSTANT("SIGPWR", (zend_long) SIGPWR, CONST_CS | CONST_PERSISTENT);
154156
#endif

0 commit comments

Comments
 (0)