merge revision(s) 18450:

	* stable/ext/socket/socket.c (NI_MAXHOST, NI_MAXSERV): fixed invalid
	  preprocessor directives.  a patch from Peter Bowen at
	  [ruby-core:18211].


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

3 files changed, 12 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 8da8abc463..5d9d2d9089 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Jan 14 10:39:56 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* stable/ext/socket/socket.c (NI_MAXHOST, NI_MAXSERV): fixed invalid
+	  preprocessor directives.  a patch from Peter Bowen at
+	  [ruby-core:18211].
+
 Tue Jan 13 04:40:30 2009  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* lib/net/ftp.rb (login): raise FTPReplyError if passwd or acct
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index 1dcc7160e9..6dc4f832ac 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -893,10 +893,10 @@ port_str(port, pbuf, len)
 }
 
 #ifndef NI_MAXHOST
-# define 1025
+# define NI_MAXHOST 1025
 #endif
 #ifndef NI_MAXSERV
-# define 32
+# define NI_MAXSERV 32
 #endif
 
 static struct addrinfo*
diff --git a/version.h b/version.h
index c2dac736d3..19bc4c1b36 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2009-01-13"
+#define RUBY_RELEASE_DATE "2009-01-14"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20090113
-#define RUBY_PATCHLEVEL 84
+#define RUBY_RELEASE_CODE 20090114
+#define RUBY_PATCHLEVEL 85
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 13
+#define RUBY_RELEASE_DAY 14
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];