Mercurial > hg > octave-nkf

changeset 10344:65974373505a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Do not use SIGALRM unconditinally.
author Michael Goffioul <michael.goffioul@gmail.com>
date Sun, 21 Feb 2010 17:40:13 +0000
parents 2ef5144ccb0d
children 33b012d39dce
files src/ChangeLog src/sighandlers.cc
diffstat 2 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2010-02-21  Michael Goffioul  <michael.goffioul@gmail.com>
 
+	* sighandlers.cc (octave_set_signal_handler): Don't use SIGALRM
+	unconditionally.
+
 	* ov-bool.h (class octave_bool): Add OCTINTERP_API.
 	* unwind-prot.h (class unwind_protect_safe): Ditto.
 
--- a/src/sighandlers.cc
+++ b/src/sighandlers.cc
@@ -178,15 +178,20 @@
   act.sa_handler = handler;
   act.sa_flags = 0;
 
+#if defined (SIGALRM)
   if (sig == SIGALRM)
     {
 #if defined (SA_INTERRUPT)
       act.sa_flags |= SA_INTERRUPT;
 #endif
     }
+#endif
 #if defined (SA_RESTART)
+#if defined (SIGALRM)
+  else
+#endif
   // FIXME -- Do we also need to explicitly disable SA_RESTART?
-  else if (restart_syscalls)
+  if (restart_syscalls)
     act.sa_flags |= SA_RESTART;
 #endif