From 083b923ea80ae15cb4b623bca71d92d083073da4 Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 22 Nov 2011 08:49:47 +0000 Subject: * win32/win32.c (_pioinfo): make an inline function. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33816 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- win32/win32.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'win32') diff --git a/win32/win32.c b/win32/win32.c index 89bca5ac4f..a2b24c764d 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -2159,7 +2159,6 @@ EXTERN_C _CRTIMP ioinfo * __pioinfo[]; #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 @@ set_pioinfo_extra(void) #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)) -- cgit v1.2.3