lbarnaud Wed Mar 25 23:34:08 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pcntl pcntl.c
/php-src/ext/pcntl/tests 002.phpt
Log:
MFH: Fix build on FreeBSD <7 (fixes #47777)
http://cvs.php.net/viewvc.cgi/php-src/ext/pcntl/pcntl.c?r1=1.48.2.2.2.4.2.16&r2=1.48.2.2.2.4.2.17&diff_format=u
Index: php-src/ext/pcntl/pcntl.c
diff -u php-src/ext/pcntl/pcntl.c:1.48.2.2.2.4.2.16
php-src/ext/pcntl/pcntl.c:1.48.2.2.2.4.2.17
--- php-src/ext/pcntl/pcntl.c:1.48.2.2.2.4.2.16 Wed Mar 25 22:52:30 2009
+++ php-src/ext/pcntl/pcntl.c Wed Mar 25 23:34:08 2009
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pcntl.c,v 1.48.2.2.2.4.2.16 2009/03/25 22:52:30 felipe Exp $ */
+/* $Id: pcntl.c,v 1.48.2.2.2.4.2.17 2009/03/25 23:34:08 lbarnaud Exp $ */
#define PCNTL_DEBUG 0
@@ -290,50 +290,120 @@
#endif
/* si_code for SIGCHILD */
+#ifdef CLD_EXITED
REGISTER_LONG_CONSTANT("CLD_EXITED", CLD_EXITED, CONST_CS |
CONST_PERSISTENT);
+#endif
+#ifdef CLD_KILLED
REGISTER_LONG_CONSTANT("CLD_KILLED", CLD_KILLED, CONST_CS |
CONST_PERSISTENT);
+#endif
+#ifdef CLD_DUMPED
REGISTER_LONG_CONSTANT("CLD_DUMPED", CLD_DUMPED, CONST_CS |
CONST_PERSISTENT);
+#endif
+#ifdef CLD_TRAPPED
REGISTER_LONG_CONSTANT("CLD_TRAPPED", CLD_TRAPPED, CONST_CS |
CONST_PERSISTENT);
+#endif
+#ifdef CLD_STOPPED
REGISTER_LONG_CONSTANT("CLD_STOPPED", CLD_STOPPED, CONST_CS |
CONST_PERSISTENT);
+#endif
+#ifdef CLD_CONTINUED
REGISTER_LONG_CONSTANT("CLD_CONTINUED", CLD_CONTINUED, CONST_CS |
CONST_PERSISTENT);
+#endif
/* si_code for SIGTRAP */
+#ifdef TRAP_BRKPT
REGISTER_LONG_CONSTANT("TRAP_BRKPT", TRAP_BRKPT, CONST_CS |
CONST_PERSISTENT);
+#endif
+#ifdef TRAP_TRACE
REGISTER_LONG_CONSTANT("TRAP_TRACE", TRAP_TRACE, CONST_CS |
CONST_PERSISTENT);
+#endif
/* si_code for SIGPOLL */
+#ifdef POLL_IN
REGISTER_LONG_CONSTANT("POLL_IN", POLL_IN, CONST_CS |
CONST_PERSISTENT);
+#endif
+#ifdef POLL_OUT
REGISTER_LONG_CONSTANT("POLL_OUT", POLL_OUT, CONST_CS |
CONST_PERSISTENT);
+#endif
+#ifdef POLL_MSG
REGISTER_LONG_CONSTANT("POLL_MSG", POLL_MSG, CONST_CS |
CONST_PERSISTENT);
+#endif
+#ifdef POLL_ERR
REGISTER_LONG_CONSTANT("POLL_ERR", POLL_ERR, CONST_CS |
CONST_PERSISTENT);
+#endif
+#ifdef POLL_PRI
REGISTER_LONG_CONSTANT("POLL_PRI", POLL_PRI, CONST_CS |
CONST_PERSISTENT);
+#endif
+#ifdef POLL_HUP
REGISTER_LONG_CONSTANT("POLL_HUP", POLL_HUP, CONST_CS |
CONST_PERSISTENT);
+#endif
+#ifdef ILL_ILLOPC
REGISTER_LONG_CONSTANT("ILL_ILLOPC", ILL_ILLOPC, CONST_CS |
CONST_PERSISTENT);
+#endif
+#ifdef ILL_ILLOPN
REGISTER_LONG_CONSTANT("ILL_ILLOPN", ILL_ILLOPN, CONST_CS |
CONST_PERSISTENT);
+#endif
+#ifdef ILL_ILLADR
REGISTER_LONG_CONSTANT("ILL_ILLADR", ILL_ILLADR, CONST_CS |
CONST_PERSISTENT);
+#endif
+#ifdef ILL_ILLTRP
REGISTER_LONG_CONSTANT("ILL_ILLTRP", ILL_ILLTRP, CONST_CS |
CONST_PERSISTENT);
+#endif
+#ifdef ILL_PRVOPC
REGISTER_LONG_CONSTANT("ILL_PRVOPC", ILL_PRVOPC, CONST_CS |
CONST_PERSISTENT);
+#endif
+#ifdef ILL_PRVREG
REGISTER_LONG_CONSTANT("ILL_PRVREG", ILL_PRVREG, CONST_CS |
CONST_PERSISTENT);
+#endif
+#ifdef ILL_COPROC
REGISTER_LONG_CONSTANT("ILL_COPROC", ILL_COPROC, CONST_CS |
CONST_PERSISTENT);
+#endif
+#ifdef ILL_BADSTK
REGISTER_LONG_CONSTANT("ILL_BADSTK", ILL_BADSTK, CONST_CS |
CONST_PERSISTENT);
+#endif
+#ifdef FPE_INTDIV
REGISTER_LONG_CONSTANT("FPE_INTDIV", FPE_INTDIV, CONST_CS |
CONST_PERSISTENT);
+#endif
+#ifdef FPE_INTOVF
REGISTER_LONG_CONSTANT("FPE_INTOVF", FPE_INTOVF, CONST_CS |
CONST_PERSISTENT);
+#endif
+#ifdef FPE_FLTDIV
REGISTER_LONG_CONSTANT("FPE_FLTDIV", FPE_FLTDIV, CONST_CS |
CONST_PERSISTENT);
+#endif
+#ifdef FPE_FLTOVF
REGISTER_LONG_CONSTANT("FPE_FLTOVF", FPE_FLTOVF, CONST_CS |
CONST_PERSISTENT);
+#endif
+#ifdef FPE_FLTUND
REGISTER_LONG_CONSTANT("FPE_FLTUND", FPE_FLTINV, CONST_CS |
CONST_PERSISTENT);
+#endif
+#ifdef FPE_FLTRES
REGISTER_LONG_CONSTANT("FPE_FLTRES", FPE_FLTRES, CONST_CS |
CONST_PERSISTENT);
+#endif
+#ifdef FPE_FLTINV
REGISTER_LONG_CONSTANT("FPE_FLTINV", FPE_FLTINV, CONST_CS |
CONST_PERSISTENT);
+#endif
+#ifdef FPE_FLTSUB
REGISTER_LONG_CONSTANT("FPE_FLTSUB", FPE_FLTSUB, CONST_CS |
CONST_PERSISTENT);
+#endif
+#ifdef SEGV_MAPERR
REGISTER_LONG_CONSTANT("SEGV_MAPERR", SEGV_MAPERR, CONST_CS |
CONST_PERSISTENT);
+#endif
+#ifdef SEGV_ACCERR
REGISTER_LONG_CONSTANT("SEGV_ACCERR", SEGV_ACCERR, CONST_CS |
CONST_PERSISTENT);
+#endif
+#ifdef BUS_ADRALN
REGISTER_LONG_CONSTANT("BUS_ADRALN", BUS_ADRALN, CONST_CS |
CONST_PERSISTENT);
+#endif
+#ifdef BUS_ADRERR
REGISTER_LONG_CONSTANT("BUS_ADRERR", BUS_ADRERR, CONST_CS |
CONST_PERSISTENT);
+#endif
+#ifdef BUS_OBJERR
REGISTER_LONG_CONSTANT("BUS_OBJERR", BUS_OBJERR, CONST_CS |
CONST_PERSISTENT);
#endif
+#endif /* HAVE_SIGWAITINFO && HAVE_SIGTIMEDWAIT */
/* }}} */
}
http://cvs.php.net/viewvc.cgi/php-src/ext/pcntl/tests/002.phpt?r1=1.1.2.6&r2=1.1.2.7&diff_format=u
Index: php-src/ext/pcntl/tests/002.phpt
diff -u php-src/ext/pcntl/tests/002.phpt:1.1.2.6
php-src/ext/pcntl/tests/002.phpt:1.1.2.7
--- php-src/ext/pcntl/tests/002.phpt:1.1.2.6 Mon Nov 10 05:57:18 2008
+++ php-src/ext/pcntl/tests/002.phpt Wed Mar 25 23:34:08 2009
@@ -5,6 +5,7 @@
if (!extension_loaded('pcntl')) die('skip pcntl extension not
available');
elseif (!extension_loaded('posix')) die('skip posix extension not
available');
elseif (!function_exists('pcntl_sigwaitinfo') or
!function_exists('pcntl_sigtimedwait')) die('skip required functionality is not
available');
+ elseif (!defined('CLD_EXITED')) die('skip CLD_EXITED not defined');
?>
--FILE--
<?php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
