kosaki	2011-11-12 11:29:37 +0900 (Sat, 12 Nov 2011)

  New Revision: 33718

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

  Log:
    * io.c (ioctl_narg_len): Linux doesn't have IOCPARM_LEN macro, but
      has _IOC_SIZE. support it.

  Modified files:
    trunk/ChangeLog
    trunk/io.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 33717)
+++ ChangeLog	(revision 33718)
@@ -1,3 +1,8 @@
+Sat Nov 12 11:16:32 2011  KOSAKI Motohiro  <kosaki.motohiro@g...>
+
+	* io.c (ioctl_narg_len): Linux doesn't have IOCPARM_LEN macro, but
+	  has _IOC_SIZE. support it.
+
 Sat Nov 12 11:13:18 2011  KOSAKI Motohiro  <kosaki.motohiro@g...>
 
 	* io.c (rb_ioctl): don't expose our sanity check value to ruby script.
Index: io.c
===================================================================
--- io.c	(revision 33717)
+++ io.c	(revision 33718)
@@ -7908,6 +7908,8 @@
 #endif
 #ifdef IOCPARM_LEN
     len = IOCPARM_LEN(cmd);	/* on BSDish systems we're safe */
+#elif defined(_IOC_SIZE)
+    len = _IOC_SIZE(cmd);
 #else
     len = 256;		/* otherwise guess at what's safe */
 #endif

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/