merge revision(s) 24750:

	* numeric.c (round): added declaration.  [ruby-dev:39222]


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

3 files changed, 10 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 67b3ccfc20..50e909d9f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Nov 17 15:31:09 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (round): added declaration.  [ruby-dev:39222]
+
 Mon Nov 16 19:58:02 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* gc.c (gc_sweep): makes new room if object space is full of
diff --git a/numeric.c b/numeric.c
index de00de20d9..634c2eb940 100644
--- a/numeric.c
+++ b/numeric.c
@@ -63,6 +63,8 @@
 #define DBL_EPSILON 2.2204460492503131e-16
 #endif
 
+extern double round _((double));
+
 #ifndef HAVE_ROUND
 double
 round(x)
diff --git a/version.h b/version.h
index 51939d7e46..657ed422aa 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2009-11-16"
+#define RUBY_RELEASE_DATE "2009-11-17"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20091116
-#define RUBY_PATCHLEVEL 205
+#define RUBY_RELEASE_CODE 20091117
+#define RUBY_PATCHLEVEL 206
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 11
-#define RUBY_RELEASE_DAY 16
+#define RUBY_RELEASE_DAY 17
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];