yugui	2011-01-16 21:35:22 +0900 (Sun, 16 Jan 2011)

  New Revision: 30573

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30573

  Log:
    merges r30525 from trunk into ruby_1_9_2.
    --
    * io.c (rb_f_syscall): Add 64bit Linux support. Some syscall takes
      long type arguments.

  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 30572)
+++ ruby_1_9_2/ChangeLog	(revision 30573)
@@ -1,3 +1,8 @@
+Wed Jan 12 23:55:48 2011  KOSAKI Motohiro  <kosaki.motohiro@g...>
+
+	* io.c (rb_f_syscall): Add 64bit Linux support. Some syscall takes
+	  long type arguments.
+
 Thu Jan 13 00:06:38 2011  KOSAKI Motohiro  <kosaki.motohiro@g...>
 
 	* io.c (rb_f_syscall): Add warning messages. [ruby-core:34062]
Index: ruby_1_9_2/io.c
===================================================================
--- ruby_1_9_2/io.c	(revision 30572)
+++ ruby_1_9_2/io.c	(revision 30573)
@@ -7555,6 +7555,18 @@
 # else
 #  error ---->> it is asserted that __syscall takes the first argument and returns retval in 64bit signed integer. <<----
 # endif
+#elif defined linux
+# define SYSCALL syscall
+# define NUM2SYSCALLID(x) NUM2LONG(x)
+# define RETVAL2NUM(x) LONG2NUM(x)
+    /*
+     * Linux man page says, syscall(2) function prototype is below.
+     *
+     *     int syscall(int number, ...);
+     *
+     * But, it's incorrect. Actual one takes and returned long. (see unistd.h)
+     */
+    long num, retval = -1;
 #else
 # define SYSCALL syscall
 # define NUM2SYSCALLID(x) NUM2INT(x)
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 30572)
+++ ruby_1_9_2/version.h	(revision 30573)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 153
+#define RUBY_PATCHLEVEL 154
 #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/