ruby-changes:19756
From: yugui <ko1@a...>
Date: Mon, 30 May 2011 07:54:08 +0900 (JST)
Subject: [ruby-changes:19756] yugui:r31800 (ruby_1_9_2): merges r31272 from trunk into ruby_1_9_2.
yugui 2011-05-30 07:49:45 +0900 (Mon, 30 May 2011) New Revision: 31800 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=31800 Log: merges r31272 from trunk into ruby_1_9_2. -- * io.c (rb_f_syscall): reduce warning: "HAVE___SYSCALL" is not defined. Modified files: branches/ruby_1_9_2/ChangeLog branches/ruby_1_9_2/io.c branches/ruby_1_9_2/version.h Index: ruby_1_9_2/ChangeLog =================================================================== --- ruby_1_9_2/ChangeLog (revision 31799) +++ ruby_1_9_2/ChangeLog (revision 31800) @@ -1,3 +1,7 @@ +Thu Apr 14 16:01:45 2011 Kazuhiro NISHIYAMA <zn@m...> + + * io.c (rb_f_syscall): reduce warning: "HAVE___SYSCALL" is not defined. + Tue Apr 12 19:19:50 2011 NARUSE, Yui <naruse@r...> * lib/uri/common.rb: avoid race condition. fixes #4572 Index: ruby_1_9_2/io.c =================================================================== --- ruby_1_9_2/io.c (revision 31799) +++ ruby_1_9_2/io.c (revision 31800) @@ -7544,7 +7544,7 @@ #else VALUE arg[8]; #endif -#if SIZEOF_VOIDP == 8 && HAVE___SYSCALL && SIZEOF_INT != 8 /* mainly *BSD */ +#if SIZEOF_VOIDP == 8 && defined(HAVE___SYSCALL) && SIZEOF_INT != 8 /* mainly *BSD */ # define SYSCALL __syscall # define NUM2SYSCALLID(x) NUM2LONG(x) # define RETVAL2NUM(x) LONG2NUM(x) Index: ruby_1_9_2/version.h =================================================================== --- ruby_1_9_2/version.h (revision 31799) +++ ruby_1_9_2/version.h (revision 31800) @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 227 +#define RUBY_PATCHLEVEL 228 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/