From cc3d03b196dd3205ac8798db938711598c99d413 Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 14 Mar 2012 08:56:42 +0000
Subject: [PATCH] * 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/trunk@35015 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 5 +++++
 numeric.c | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 08f19f5472..7898bb81d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar 14 17:55:29 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* numeric.c (flodivmod): must through the same pass if HAVE_FMOD or not.
+	  this is a bugfix of r35013.
+
 Wed Mar 14 16:41:55 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* test/test_tmpdir.rb (TestTmpdir#test_world_writable): skip on Windows.
diff --git a/numeric.c b/numeric.c
index 5eff5ad547..49bfbbaf01 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