* numeric.c (flo_divmod): round to the nearest integer. [ ruby-Bugs-14540 ]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@13902 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 9 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 78af6dea5c..3e9f449e8e 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 ]
+
 Mon Nov 12 16:52:29 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (create_makefile): rdoc about srcprefix.  a patch from
diff --git a/numeric.c b/numeric.c
index 643a2cae80..93f569fd40 100644
--- a/numeric.c
+++ b/numeric.c
@@ -736,7 +736,7 @@ flo_divmod(x, 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 1fce49a737..ca21de4377 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2007-11-12"
+#define RUBY_RELEASE_DATE "2007-11-13"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20071112
+#define RUBY_RELEASE_CODE 20071113
 #define RUBY_PATCHLEVEL 5000
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 6
 #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[];