From 75d2bec7a9b586e3c3767a11c8409622f57a47ac Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 7 Mar 2018 02:27:18 +0000 Subject: [PATCH] complex.c, rational.c: simplified macro conditions git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62682 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- complex.c | 12 +----------- rational.c | 4 ---- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/complex.c b/complex.c index 40fec0c3b1..83cc041d58 100644 --- a/complex.c +++ b/complex.c @@ -329,10 +329,6 @@ f_complex_new_bang2(VALUE klass, VALUE x, VALUE y) } #ifdef CANONICALIZATION_FOR_MATHN -#define CANON -#endif - -#ifdef CANON static int canonicalization = 0; RUBY_FUNC_EXPORTED void @@ -358,15 +354,9 @@ nucomp_real_check(VALUE num) inline static VALUE nucomp_s_canonicalize_internal(VALUE klass, VALUE real, VALUE imag) { -#ifdef CANON -#define CL_CANON -#ifdef CL_CANON +#ifdef CANONICALIZATION_FOR_MATHN if (k_exact_zero_p(imag) && canonicalization) return real; -#else - if (f_zero_p(imag) && canonicalization) - return real; -#endif #endif if (f_real_p(real) && f_real_p(imag)) return nucomp_s_new_internal(klass, real, imag); diff --git a/rational.c b/rational.c index b648b19438..69a8074e1b 100644 --- a/rational.c +++ b/rational.c @@ -429,10 +429,6 @@ f_rational_new_bang1(VALUE klass, VALUE x) } #ifdef CANONICALIZATION_FOR_MATHN -#define CANON -#endif - -#ifdef CANON static int canonicalization = 0; RUBY_FUNC_EXPORTED void