nagachika	2013-03-09 23:15:47 +0900 (Sat, 09 Mar 2013)

  New Revision: 39671

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

  Log:
    merge revision(s) 39445,39447:
    
    * signal.c (sigsegv): suppress unused result warning. Because
      write(2) is marked __warn_unused_result__ on Linux glibc.

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/signal.c
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 39670)
+++ ruby_2_0_0/ChangeLog	(revision 39671)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Sat Mar  9 23:15:06 2013  KOSAKI Motohiro  <kosaki.motohiro@g...>
+
+	* signal.c (sigsegv): suppress unused result warning. Because
+	  write(2) is marked __warn_unused_result__ on Linux glibc.
+
 Sat Mar  9 23:08:43 2013  Nobuyoshi Nakada  <nobu@r...>
 
 	* compile.c (iseq_set_arguments): no keyword check if any keyword rest
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 39670)
+++ ruby_2_0_0/version.h	(revision 39671)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-03-09"
-#define RUBY_PATCHLEVEL 40
+#define RUBY_PATCHLEVEL 41
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 3
Index: ruby_2_0_0/signal.c
===================================================================
--- ruby_2_0_0/signal.c	(revision 39670)
+++ ruby_2_0_0/signal.c	(revision 39671)
@@ -658,8 +658,10 @@ static RETSIGTYPE https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/signal.c#L658
 sigsegv(int sig SIGINFO_ARG)
 {
     if (segv_received) {
+	ssize_t RB_UNUSED_VAR(err);
 	char msg[] = "SEGV received in SEGV handler\n";
-	write(2, msg, sizeof(msg));
+
+	err = write(2, msg, sizeof(msg));
 	ruby_abort();
     }
 

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r39445,39447


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