diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-14 01:39:19 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-14 01:39:19 +0000 |
commit | 8453350cc0e04c3c418ce15f672ff0c417ffab61 (patch) | |
tree | 82e744bff2aabc74417eccb745ff95d558174926 | |
parent | 95f1f18d06d972970ea8f051faa31999abf82600 (diff) |
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_6@21498 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | ext/socket/socket.c | 4 | ||||
-rw-r--r-- | version.h | 8 |
3 files changed, 12 insertions, 6 deletions
@@ -1,3 +1,9 @@ +Wed Jan 14 10:32:13 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:39: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 22e178a4c8..d037be02c7 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* @@ -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[]; |