kosaki	2011-06-28 19:42:25 +0900 (Tue, 28 Jun 2011)

  New Revision: 32270

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=32270

  Log:
    * signal.c: Now, USE_TRAP_SIGMASK depend on HAVE_PTHREAD_SIGMASK.
      The code have already depended on pthread_sigmask since r27464.

  Modified files:
    trunk/ChangeLog
    trunk/configure.in
    trunk/signal.c

Index: configure.in
===================================================================
--- configure.in	(revision 32269)
+++ configure.in	(revision 32270)
@@ -1750,7 +1750,7 @@
 	pthread_getattr_np pthread_attr_get_np pthread_attr_getstack\
 	pthread_get_stackaddr_np pthread_get_stacksize_np \
 	thr_stksegment pthread_stackseg_np pthread_getthrds_np \
-	pthread_condattr_setclock)
+	pthread_condattr_setclock pthread_sigmask)
 fi
 if test x"$ac_cv_header_ucontext_h" = xyes; then
     if test x"$rb_with_pthread" = xyes; then
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 32269)
+++ ChangeLog	(revision 32270)
@@ -1,3 +1,8 @@
+Tue Jun 28 19:23:01 2011  KOSAKI Motohiro  <kosaki.motohiro@g...>
+
+	* signal.c: Now, USE_TRAP_SIGMASK depend on HAVE_PTHREAD_SIGMASK.
+	  The code have already depended on pthread_sigmask since r27464.
+
 Tue Jun 28 15:09:21 2011  NARUSE, Yui  <naruse@r...>
 
 	* lib/benchmark.rb: merge eregon/benchmark.
Index: signal.c
===================================================================
--- signal.c	(revision 32269)
+++ signal.c	(revision 32270)
@@ -32,7 +32,7 @@
 #undef SIGBUS
 #endif
 
-#if defined HAVE_SIGPROCMASK || defined HAVE_SIGSETMASK
+#ifdef HAVE_PTHREAD_SIGMASK
 #define USE_TRAP_MASK 1
 #else
 #define USE_TRAP_MASK 0
@@ -520,11 +520,7 @@
 }
 
 #if USE_TRAP_MASK
-# ifdef HAVE_SIGPROCMASK
 static sigset_t trap_last_mask;
-# else
-static int trap_last_mask;
-# endif
 #endif
 
 #if HAVE_PTHREAD_H
@@ -670,11 +666,7 @@
 
 struct trap_arg {
 #if USE_TRAP_MASK
-# ifdef HAVE_SIGPROCMASK
     sigset_t mask;
-# else
-    int mask;
-# endif
 #endif
     int sig;
     sighandler_t func;
@@ -854,12 +846,8 @@
     vm->trap_list[sig].safe = rb_safe_level();
     /* enable at least specified signal. */
 #if USE_TRAP_MASK
-#ifdef HAVE_SIGPROCMASK
     sigdelset(&arg->mask, sig);
-#else
-    arg->mask &= ~sigmask(sig);
 #endif
-#endif
     return oldcmd;
 }
 
@@ -989,16 +977,9 @@
 {
     sighandler_t oldfunc;
 #if USE_TRAP_MASK
-# ifdef HAVE_SIGPROCMASK
     sigset_t mask;
     sigset_t fullmask;
-# else
-    int mask;
-    int fullmask;
-# endif
-#endif
 
-#if USE_TRAP_MASK
     /* disable interrupt */
     sigfillset(&fullmask);
     pthread_sigmask(SIG_BLOCK, &fullmask, &mask);

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/