shyouhei	2009-01-14 10:42:10 +0900 (Wed, 14 Jan 2009)

  New Revision: 21500

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21500

  Log:
    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].

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/ext/socket/socket.c
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ext/socket/socket.c
===================================================================
--- ruby_1_8_7/ext/socket/socket.c	(revision 21499)
+++ ruby_1_8_7/ext/socket/socket.c	(revision 21500)
@@ -893,10 +893,10 @@
 }
 
 #ifndef NI_MAXHOST
-# define 1025
+# define NI_MAXHOST 1025
 #endif
 #ifndef NI_MAXSERV
-# define 32
+# define NI_MAXSERV 32
 #endif
 
 static struct addrinfo*
Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 21499)
+++ ruby_1_8_7/ChangeLog	(revision 21500)
@@ -1,3 +1,9 @@
+Wed Jan 14 10:39:56 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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@r...>
 
 	* lib/net/ftp.rb (login): raise FTPReplyError if passwd or acct
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 21499)
+++ ruby_1_8_7/version.h	(revision 21500)
@@ -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[];

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/