kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merges r31272 from trunk into ruby_1_9_2.

Browse source 
--
* io.c (rb_f_syscall): reduce warning: "HAVE___SYSCALL" is not defined.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@31800 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2011-05-29 22:49:45 +00:00
parent ca0ac3e3c9
commit 48a3fa9005
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Thu Apr 14 16:01:45 2011 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
* io.c (rb_f_syscall): reduce warning: "HAVE___SYSCALL" is not defined.
Tue Apr 12 19:19:50 2011 NARUSE, Yui <naruse@ruby-lang.org>
* lib/uri/common.rb: avoid race condition. fixes #4572

2
io.c
View file

@ -7544,7 +7544,7 @@ rb_f_syscall(int argc, VALUE *argv)
#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)

2
version.h
View file

@ -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