comparison: boost/boost.patch
boost/boost.patch
- changeset 700
- 2164082fa57f
equal
deleted
inserted
replaced
| -1:000000000000 | 0:ae2edc89cec4 |
|---|---|
| 1 Index: boost/test/impl/execution_monitor.ipp | |
| 2 --- boost/test/impl/execution_monitor.ipp.orig 2009-11-28 10:19:18.000000000 +0100 | |
| 3 +++ boost/test/impl/execution_monitor.ipp 2011-06-08 21:40:48.000000000 +0200 | |
| 4 @@ -353,6 +353,7 @@ | |
| 5 break; | |
| 6 } | |
| 7 | |
| 8 +#if 0 | |
| 9 switch( m_sig_info->si_signo ) { | |
| 10 case SIGILL: | |
| 11 switch( m_sig_info->si_code ) { | |
| 12 @@ -508,11 +509,13 @@ | |
| 13 case SIGCHLD: | |
| 14 switch( m_sig_info->si_code ) { | |
| 15 #ifndef BOOST_TEST_LIMITED_SIGNAL_DETAILS | |
| 16 +#ifdef CLD_EXITED | |
| 17 case CLD_EXITED: | |
| 18 report_error( execution_exception::system_error, | |
| 19 "child has exited; pid: %d; uid: %d; exit value: %d", | |
| 20 (int)m_sig_info->si_pid, (int)m_sig_info->si_uid, (int)m_sig_info->si_status ); | |
| 21 break; | |
| 22 +#endif | |
| 23 case CLD_KILLED: | |
| 24 report_error( execution_exception::system_error, | |
| 25 "child was killed; pid: %d; uid: %d; exit value: %d", | |
| 26 @@ -608,6 +611,7 @@ | |
| 27 default: | |
| 28 report_error( execution_exception::system_error, "unrecognized signal" ); | |
| 29 } | |
| 30 +#endif | |
| 31 } | |
| 32 | |
| 33 //____________________________________________________________________________// | |
| 34 @@ -817,8 +821,10 @@ | |
| 35 { | |
| 36 return info->si_signo == SIGCHLD | |
| 37 #ifndef BOOST_TEST_LIMITED_SIGNAL_DETAILS | |
| 38 +#ifdef CLD_EXITED | |
| 39 && info->si_code == CLD_EXITED | |
| 40 #endif | |
| 41 +#endif | |
| 42 #ifdef BOOST_TEST_IGNORE_NON_ZERO_CHILD_CODE | |
| 43 ; | |
| 44 #else |
