From 58fef6226ed517fbefa77ec61eea81cc18f823c1 Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 12 Oct 2012 04:38:43 +0000
Subject: merge revision(s) 35015:

* numeric.c (flodivmod): must through the same pass if HAVE_FMOD or not.
  this is a bugfix of r35013.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37151 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 numeric.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'numeric.c')

diff --git a/numeric.c b/numeric.c
index 497b93b85d..56f08bc237 100644
--- a/numeric.c
+++ b/numeric.c
@@ -814,18 +814,18 @@ flodivmod(double x, double y, double *divp, double *modp)
     double div, mod;
 
     if (y == 0.0) rb_num_zerodiv();
-#ifdef HAVE_FMOD
-    mod = fmod(x, y);
-#else
     if((x == 0.0) || (isinf(y) && !isinf(x)))
         mod = x;
     else {
+#ifdef HAVE_FMOD
+	mod = fmod(x, y);
+#else
 	double z;
 
 	modf(x/y, &z);
 	mod = x - z * y;
-    }
 #endif
+    }
     if (isinf(x) && !isinf(y) && !isnan(y))
 	div = x;
     else
-- 
cgit v1.2.3