ruby-changes:9957
From: shyouhei <ko1@a...>
Date: Wed, 14 Jan 2009 10:39:32 +0900 (JST)
Subject: [ruby-changes:9957] Ruby:r21498 (ruby_1_8_6): merge revision(s) 18450:
shyouhei 2009-01-14 10:39:19 +0900 (Wed, 14 Jan 2009) New Revision: 21498 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21498 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_6/ChangeLog branches/ruby_1_8_6/ext/socket/socket.c branches/ruby_1_8_6/version.h Index: ruby_1_8_6/ext/socket/socket.c =================================================================== --- ruby_1_8_6/ext/socket/socket.c (revision 21497) +++ ruby_1_8_6/ext/socket/socket.c (revision 21498) @@ -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_6/ChangeLog =================================================================== --- ruby_1_8_6/ChangeLog (revision 21497) +++ ruby_1_8_6/ChangeLog (revision 21498) @@ -1,3 +1,9 @@ +Wed Jan 14 10:32:13 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:39:30 2009 Shugo Maeda <shugo@r...> * lib/net/ftp.rb (login): raise FTPReplyError if passwd or acct Index: ruby_1_8_6/version.h =================================================================== --- ruby_1_8_6/version.h (revision 21497) +++ ruby_1_8_6/version.h (revision 21498) @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.6" -#define RUBY_RELEASE_DATE "2009-01-13" +#define RUBY_RELEASE_DATE "2009-01-14" #define RUBY_VERSION_CODE 186 -#define RUBY_RELEASE_CODE 20090113 -#define RUBY_PATCHLEVEL 297 +#define RUBY_RELEASE_CODE 20090114 +#define RUBY_PATCHLEVEL 298 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 6 #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/