shyouhei	2008-08-04 13:52:05 +0900 (Mon, 04 Aug 2008)

  New Revision: 18337

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

  Log:
    merge revision(s) 18211:
    * bignum.c (rb_big2str0, bigsqr): made interruptible.  [ruby-Bugs-20622]

  Modified files:
    branches/ruby_1_8_6/ChangeLog
    branches/ruby_1_8_6/bignum.c
    branches/ruby_1_8_6/common.mk
    branches/ruby_1_8_6/version.h

Index: ruby_1_8_6/ChangeLog
===================================================================
--- ruby_1_8_6/ChangeLog	(revision 18336)
+++ ruby_1_8_6/ChangeLog	(revision 18337)
@@ -1,3 +1,7 @@
+Mon Aug  4 13:49:36 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* bignum.c (rb_big2str0, bigsqr): made interruptible.  [ruby-Bugs-20622]
+
 Mon Aug  4 13:39:53 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* ext/openssl/openssl_missing.h (d2i_of_void): define for older
Index: ruby_1_8_6/version.h
===================================================================
--- ruby_1_8_6/version.h	(revision 18336)
+++ ruby_1_8_6/version.h	(revision 18337)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-08-04"
 #define RUBY_VERSION_CODE 186
 #define RUBY_RELEASE_CODE 20080804
-#define RUBY_PATCHLEVEL 282
+#define RUBY_PATCHLEVEL 283
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_6/bignum.c
===================================================================
--- ruby_1_8_6/bignum.c	(revision 18336)
+++ ruby_1_8_6/bignum.c	(revision 18337)
@@ -11,6 +11,7 @@
 **********************************************************************/
 
 #include "ruby.h"
+#include "rubysig.h"
 
 #include <math.h>
 #include <ctype.h>
@@ -709,6 +710,7 @@
     s = RSTRING(ss)->ptr;
 
     s[0] = RBIGNUM(x)->sign ? '+' : '-';
+    TRAP_BEG;
     while (i && j > 1) {
 	long k = i;
 	BDIGIT_DBL num = 0;
@@ -738,6 +740,7 @@
 	RSTRING(ss)->len = i;
     }
     s[RSTRING(ss)->len] = '\0';
+    TRAP_END;
 
     return ss;
 }
Index: ruby_1_8_6/common.mk
===================================================================
--- ruby_1_8_6/common.mk	(revision 18336)
+++ ruby_1_8_6/common.mk	(revision 18337)
@@ -341,7 +341,8 @@
   {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
   {$(VPATH)}util.h {$(VPATH)}st.h
 bignum.$(OBJEXT): {$(VPATH)}bignum.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
+  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
+  {$(VPATH)}rubysig.h
 class.$(OBJEXT): {$(VPATH)}class.c {$(VPATH)}ruby.h config.h \
   {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
   {$(VPATH)}rubysig.h {$(VPATH)}node.h {$(VPATH)}st.h

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