From 8d464a9948f034160617b86aa5de43780e226f95 Mon Sep 17 00:00:00 2001
From: shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 12 Nov 2007 18:41:31 +0000
Subject: [PATCH] * numeric.c (flo_divmod): round to the nearest integer.  [
 ruby-Bugs-14540 ]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13902 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 5 +++++
 numeric.c | 2 +-
 version.h | 6 +++---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ba94ec147e..1d88e17131 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Nov 13 02:57:04 2007  URABE Shyouhei  <shyouhei@ice.uec.ac.jp>
+
+	* numeric.c (flo_divmod): round to the nearest integer.
+	  [ ruby-Bugs-14540 ]
+
 Tue Nov 13 00:36:16 2007  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* test/ruby/test_settracefunc.rb: fixed tests for set_trace_func.
diff --git a/numeric.c b/numeric.c
index dbe273bbcf..d9466daa91 100644
--- a/numeric.c
+++ b/numeric.c
@@ -715,7 +715,7 @@ flo_divmod(VALUE x, VALUE y)
     }
     flodivmod(RFLOAT(x)->value, fy, &div, &mod);
     if (FIXABLE(div)) {
-	val = div;
+	val = round(div);
 	a = LONG2FIX(val);
     }
     else {
diff --git a/version.h b/version.h
index 35975c4107..11e34a1dfb 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2007-11-12"
+#define RUBY_RELEASE_DATE "2007-11-13"
 #define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20071112
+#define RUBY_RELEASE_CODE 20071113
 #define RUBY_PATCHLEVEL 0
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 0
 #define RUBY_RELEASE_YEAR 2007
 #define RUBY_RELEASE_MONTH 11
-#define RUBY_RELEASE_DAY 12
+#define RUBY_RELEASE_DAY 13
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];