merges r21275 from trunk into ruby_1_9_1.

* process.c: use sigaction instead of sigset.  [ruby-core:21021]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21304 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 6 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index cb5b498097..7640a9b984 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jan  2 22:25:46 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* process.c: use sigaction instead of sigset.  [ruby-core:21021]
+
 Fri Jan  2 22:20:46 2009  Yusuke Endoh  <mame@tsg.ne.jp>
 
 	* test/ruby/test_process.rb (test_wait_and_sigchild): remove debug
diff --git a/process.c b/process.c
index fa593bc013..3c5f030b65 100644
--- a/process.c
+++ b/process.c
@@ -2559,12 +2559,8 @@ rb_f_abort(int argc, VALUE *argv)
 }
 
 
-#if defined(sun)
-#define signal(a,b) sigset(a,b)
-#else
-# if defined(POSIX_SIGNAL)
-#  define signal(a,b) posix_signal(a,b)
-# endif
+#if defined(POSIX_SIGNAL)
+# define signal(a,b) posix_signal(a,b)
 #endif
 
 void