From c17cfbd981eb234ce4a47df2eab0c739cb312f44 Mon Sep 17 00:00:00 2001 From: yugui Date: Tue, 16 Dec 2008 10:25:24 +0000 Subject: merges r20653 and r20667 from trunk into ruby_1_9_1. * complex.c, rational.c: do not use RUBY_VERSION_CODE. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20786 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 8 ++++++++ complex.c | 11 ++++------- rational.c | 11 ++++------- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 40b56621aa..94f9c0ddd6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Fri Dec 12 22:12:46 2008 Tadayoshi Funaba + + * complex.c, rational.c: do not use RUBY_VERSION_CODE. + +Fri Dec 12 10:20:55 2008 Nobuyoshi Nakada + + * complex.c, rational.c: do not use RUBY_VERSION_CODE. + Tue Dec 16 12:41:52 2008 Yuki Sonoda (Yugui) * configure.in (OBJDUMP, OBJCOPY): diff --git a/complex.c b/complex.c index 6dc09526d5..0549bab87a 100644 --- a/complex.c +++ b/complex.c @@ -320,20 +320,17 @@ f_complex_new_bang2(VALUE klass, VALUE x, VALUE y) return nucomp_s_new_internal(klass, x, y); } -#ifndef RUBY_VERSION_CODE -#include "version.h" -#endif - -#if RUBY_VERSION_CODE < 200 #define CANON -#endif - #ifdef CANON static int canonicalization = 0; void nucomp_canonicalize(int f) { + VALUE s = rb_const_get(rb_cObject, rb_intern("RUBY_VERSION")); + Check_Type(s, T_STRING); + if (rb_str_cmp(s, rb_str_new2("2.0.0")) >= 0) + rb_bug("no longer provide canonicalization"); canonicalization = f; } #endif diff --git a/rational.c b/rational.c index 82628594d3..4b6e2ea0ca 100644 --- a/rational.c +++ b/rational.c @@ -377,20 +377,17 @@ f_rational_new_bang2(VALUE klass, VALUE x, VALUE y) return nurat_s_new_internal(klass, x, y); } -#ifndef RUBY_VERSION_CODE -#include "version.h" -#endif - -#if RUBY_VERSION_CODE < 200 #define CANON -#endif - #ifdef CANON static int canonicalization = 0; void nurat_canonicalize(int f) { + VALUE s = rb_const_get(rb_cObject, rb_intern("RUBY_VERSION")); + Check_Type(s, T_STRING); + if (rb_str_cmp(s, rb_str_new2("2.0.0")) >= 0) + rb_bug("no longer provide canonicalization"); canonicalization = f; } #endif -- cgit v1.2.3