nobu	2011-11-22 17:49:47 +0900 (Tue, 22 Nov 2011)

  New Revision: 33816

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

  Log:
    * win32/win32.c (_pioinfo): make an inline function.

  Modified files:
    trunk/ChangeLog
    trunk/win32/win32.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 33815)
+++ ChangeLog	(revision 33816)
@@ -1,3 +1,7 @@
+Tue Nov 22 17:49:45 2011  Nobuyoshi Nakada  <nobu@r...>
+
+	* win32/win32.c (_pioinfo): make an inline function.
+
 Tue Nov 22 11:26:08 2011  NARUSE, Yui  <naruse@r...>
 
 Tue Nov 22 11:33:58 2011  Nobuyoshi Nakada  <nobu@r...>
Index: win32/win32.c
===================================================================
--- win32/win32.c	(revision 33815)
+++ win32/win32.c	(revision 33816)
@@ -2159,7 +2159,6 @@
 
 #define IOINFO_L2E			5
 #define IOINFO_ARRAY_ELTS	(1 << IOINFO_L2E)
-#define _pioinfo(i)	((ioinfo*)((char*)(__pioinfo[i >> IOINFO_L2E]) + (i & (IOINFO_ARRAY_ELTS - 1)) * (sizeof(ioinfo) + pioinfo_extra)))
 #define _osfhnd(i)  (_pioinfo(i)->osfhnd)
 #define _osfile(i)  (_pioinfo(i)->osfile)
 #define _pipech(i)  (_pioinfo(i)->pipech)
@@ -2190,6 +2189,14 @@
 #define pioinfo_extra 0
 #endif
 
+static inline ioinfo*
+_pioinfo(int fd)
+{
+    const size_t sizeof_ioinfo = sizeof(ioinfo) + pioinfo_extra;
+    return (ioinfo*)((char*)__pioinfo[fd >> IOINFO_L2E] +
+		     (fd & (IOINFO_ARRAY_ELTS - 1)) * sizeof_ioinfo);
+}
+
 #define _set_osfhnd(fh, osfh) (void)(_osfhnd(fh) = osfh)
 #define _set_osflags(fh, flags) (_osfile(fh) = (flags))
 

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