* signal.c (ruby_signal): don't set SA_RESTART. a backport from

  the HEAD.  [ruby-talk:220937]  [ruby-talk:147220]


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

3 files changed, 9 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 1d3db011a6..ad2455fcbb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Feb 26 09:57:58 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* signal.c (ruby_signal): don't set SA_RESTART.  a backport from
+	  the HEAD.  [ruby-talk:220937]  [ruby-talk:147220]
+
 Tue Feb 13 02:21:12 2007  Sam Roberts  <sroberts@uniserve.com>
 
 	* io.c (rb_f_syscall): Fix buffer overflow with syscall
diff --git a/signal.c b/signal.c
index 9dce9a3f17..82400e7add 100644
--- a/signal.c
+++ b/signal.c
@@ -341,14 +341,6 @@ ruby_signal(signum, handler)
     sigact.sa_handler = handler;
     sigemptyset(&sigact.sa_mask);
     sigact.sa_flags = 0;
-# if defined(SA_RESTART)
-    /* All other signals but VTALRM shall restart restartable syscall
-       VTALRM will cause EINTR to syscall if interrupted.
-    */
-    if (signum != SIGVTALRM) {
-        sigact.sa_flags |= SA_RESTART; /* SVR4, 4.3+BSD */
-    }
-# endif
 # ifdef SA_NOCLDWAIT
     if (signum == SIGCHLD && handler == SIG_IGN)
 	sigact.sa_flags |= SA_NOCLDWAIT;
diff --git a/version.h b/version.h
index 4089e94b6b..bc5d655102 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.5"
-#define RUBY_RELEASE_DATE "2007-02-14"
+#define RUBY_RELEASE_DATE "2007-02-26"
 #define RUBY_VERSION_CODE 185
-#define RUBY_RELEASE_CODE 20070214
-#define RUBY_PATCHLEVEL 20
+#define RUBY_RELEASE_CODE 20070226
+#define RUBY_PATCHLEVEL 21
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 5
 #define RUBY_RELEASE_YEAR 2007
 #define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 14
+#define RUBY_RELEASE_DAY 26
 
 RUBY_EXTERN const char ruby_version[];
 RUBY_EXTERN const char ruby_release_date[];