* merge -c 12065

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

3 files changed, 8 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 4ecb146179..39fba3ca8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar 14 12:30:00 2007  Shigeo Kobayashi  <[email protected]>
+
+	* ext/bigdecimal/bigdecimal.c: BigDecimal("-.31") is now
+	  treated as ("-0.31") not as ("0.31").
+
 Fri Mar 16 18:05:40 2007  Akinori MUSHA  <[email protected]>
 
 	* lib/cgi.rb (CGI::header): IIS >= 5.0 does not need the nph
diff --git a/ext/bigdecimal/bigdecimal.c b/ext/bigdecimal/bigdecimal.c
index 04266b1d42..fd0cd65418 100644
--- a/ext/bigdecimal/bigdecimal.c
+++ b/ext/bigdecimal/bigdecimal.c
@@ -3915,7 +3915,7 @@ VpCtoV(Real *a, char *int_chr, U_LONG ni, char *frac, U_LONG nf, char *exp_chr,
     /* get integer part */
     i = 0;
     sign = 1;
-    if(ni > 0) {
+    if(ni >= 0) {
         if(int_chr[0] == '-') {
             sign = -1;
             ++i;
diff --git a/version.h b/version.h
index ec45a9a81f..e42be2cacc 100644
--- a/version.h
+++ b/version.h
@@ -1,8 +1,8 @@
 #define RUBY_VERSION "1.8.5"
-#define RUBY_RELEASE_DATE "2007-03-13"
+#define RUBY_RELEASE_DATE "2007-03-16"
 #define RUBY_VERSION_CODE 185
 #define RUBY_RELEASE_CODE 20070316
-#define RUBY_PATCHLEVEL 36
+#define RUBY_PATCHLEVEL 37
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8