merges r31272 from trunk into ruby_1_9_2.

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

3 files changed, 6 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index e61ec4d5d0..25e74d86b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/io.c b/io.c
index c62ae6ab6b..744da5c4bb 100644
--- a/io.c
+++ b/io.c
@@ -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)
diff --git a/version.h b/version.h
index 76d326ef92..9ffc9cc7ee 100644
--- a/version.h
+++ b/version.h
@@ -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