[前][次][番号順一覧][スレッド一覧]

ruby-changes:9155

From: yugui <ko1@a...>
Date: Sat, 13 Dec 2008 10:03:13 +0900 (JST)
Subject: [ruby-changes:9155] Ruby:r20692 (ruby_1_9_1): merges r20612 and r20614 from trunk into ruby_1_9_1.

yugui	2008-12-13 10:01:56 +0900 (Sat, 13 Dec 2008)

  New Revision: 20692

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

  Log:
    merges r20612 and r20614 from trunk into ruby_1_9_1.
    * complex.c: avoided warnings on cpp. [ruby-dev:37344]
    * rational.c: ditto.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/complex.c
    branches/ruby_1_9_1/rational.c

Index: ruby_1_9_1/complex.c
===================================================================
--- ruby_1_9_1/complex.c	(revision 20691)
+++ ruby_1_9_1/complex.c	(revision 20692)
@@ -320,6 +320,10 @@
     return nucomp_s_new_internal(klass, x, y);
 }
 
+#ifndef RUBY_VERSION_CODE
+#include "version.h"
+#endif
+
 #if RUBY_VERSION_CODE < 200
 #define CANON
 #endif
@@ -1427,6 +1431,10 @@
     rb_undef_method(rb_cComplex, "step");
     rb_undef_method(rb_cComplex, "truncate");
 
+#ifndef NUBY
+#define NUBY 0
+#endif
+
 #if NUBY
     rb_undef_method(rb_cComplex, "//");
 #endif
Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 20691)
+++ ruby_1_9_1/ChangeLog	(revision 20692)
@@ -1,3 +1,9 @@
+Wed Dec 10 23:58:56 2008  Tadayoshi Funaba  <tadf@d...>
+
+	* complex.c: avoided warnings on cpp. [ruby-dev:37344]
+
+	* rational.c: ditto.
+
 Wed Dec 10 12:46:52 2008  Akinori MUSHA  <knu@i...>
 
 	* enumerator.c (enumerator_next): Fix a typo: s/rewinded/rewound/.
Index: ruby_1_9_1/rational.c
===================================================================
--- ruby_1_9_1/rational.c	(revision 20691)
+++ ruby_1_9_1/rational.c	(revision 20692)
@@ -377,6 +377,10 @@
     return nurat_s_new_internal(klass, x, y);
 }
 
+#ifndef RUBY_VERSION_CODE
+#include "version.h"
+#endif
+
 #if RUBY_VERSION_CODE < 200
 #define CANON
 #endif
@@ -1541,9 +1545,15 @@
     rb_define_method(rb_cRational, "coerce", nurat_coerce, 1);
 
     rb_define_method(rb_cRational, "div", nurat_idiv, 1);
+
+#ifndef NUBY
+#define NUBY 0
+#endif
+
 #if NUBY
     rb_define_method(rb_cRational, "//", nurat_idiv, 1);
 #endif
+
     rb_define_method(rb_cRational, "modulo", nurat_mod, 1);
     rb_define_method(rb_cRational, "%", nurat_mod, 1);
     rb_define_method(rb_cRational, "divmod", nurat_divmod, 1);

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

[前][次][番号順一覧][スレッド一覧]