Ticket #2498: 2498.patch

boost/test/impl/execution_monitor.ipp

@@ -153 +153 @@
       !defined(__NetBSD__)                                                  && \
       !defined(__QNXNTO__)
 #    define BOOST_TEST_CATCH_SIGPOLL
+
 #  endif
 
 #  ifdef BOOST_TEST_USE_ALT_STACK
@@ -477 +478 @@
                           "high priority input available; band event %d",
                           (int)m_sig_info->si_band );
             break;
-#if defined(POLL_ERR) && defined(POLL_HUP) && (POLL_ERR - POLL_HUP)
-        case POLL_HUP:
-            report_error( execution_exception::system_error,
-                          "device disconnected; band event %d",
-                          (int)m_sig_info->si_band );
+        default:
+            // the original code tried to use a #if defined to put in a case
+            // statement into this switch:
+            // #if defined(POLL_ERR) && defined(POLL_HUP) && (POLL_ERR - POLL_HUP)
+            // However, that fell foul of the prepreprocessor as POLL_HUP
+            // and POLL_ERR were defined but not as simple constants and
+            // so the preprocessor couldn't evaluate (POLL_ERR - POLL_HUP).
+            if ( m_sig_info->si_code == POLL_HUP ) {
+                report_error( execution_exception::system_error,
+                              "device disconnected; band event %d",
+                              (int)m_sig_info->si_band );
+            } else {
+                report_error( execution_exception::system_error,
+                              "unrecognised sigpoll event %d; band event %d",
+                              (int)m_sig_info->si_code,
+                              (int)m_sig_info->si_band );
+            }
             break;
-#endif
         }
         break;
 
@@ -675 +687 @@
         ::alarm( 0 );
 
 #ifdef BOOST_TEST_USE_ALT_STACK
-    stack_t sigstk = {};
+    stack_t sigstk;
+    std::memset( &sigstk, 0, sizeof(stack_t) );
 
     sigstk.ss_size  = MINSIGSTKSZ;
     sigstk.ss_flags = SS_DISABLE;