From 35ca26acc659500991b2119a0b6d9526605ca168 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Thu, 31 Mar 2011 20:37:31 +0000 Subject: [PATCH] libgo/syscalls: Use _C_long as the type of the select bits array. From-SVN: r171799 --- libgo/syscalls/sysfile_posix.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/libgo/syscalls/sysfile_posix.go b/libgo/syscalls/sysfile_posix.go index 46ac0e07e1d..d0700574111 100644 --- a/libgo/syscalls/sysfile_posix.go +++ b/libgo/syscalls/sysfile_posix.go @@ -181,20 +181,22 @@ func Gettimeofday(tv *Timeval) (errno int) { return; } +const nfdbits = unsafe.Sizeof(_C_long) * 8 + type FdSet_t struct { - Fds_bits [(FD_SETSIZE + 63) / 64]int64; + Fds_bits [(FD_SETSIZE + nfdbits - 1) / nfdbits]_C_long } func FDSet(fd int, set *FdSet_t) { - set.Fds_bits[fd / 64] |= (1 << (uint)(fd % 64)) + set.Fds_bits[fd / nfdbits] |= (1 << (uint)(fd % nfdbits)) } func FDClr(fd int, set *FdSet_t) { - set.Fds_bits[fd / 64] &= ^(1 << (uint)(fd % 64)) + set.Fds_bits[fd / nfdbits] &^= (1 << (uint)(fd % nfdbits)) } func FDIsSet(fd int, set *FdSet_t) bool { - if set.Fds_bits[fd / 64] & (1 << (uint)(fd % 64)) != 0 { + if set.Fds_bits[fd / nfdbits] & (1 << (uint)(fd % nfdbits)) != 0 { return true } else { return false @@ -202,7 +204,7 @@ func FDIsSet(fd int, set *FdSet_t) bool { } func FDZero(set *FdSet_t) { - for i := 0; i < ((FD_SETSIZE + 63) / 64); i++ { + for i := range set.Fds_bits { set.Fds_bits[i] = 0 } }