jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1566 from onionhammer/bigbreak

Browse source 
Fixed FD_SET casing
This commit is contained in:
Andreas Rumpf 2014-10-21 21:48:56 +02:00
commit 72476e1594
7 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
csources Submodule

@ -0,0 +1 @@
Subproject commit b0bcf88e26730b23d22e2663adf1babb05bd5a71

2
lib/posix/posix.nim
View file

@ -2382,7 +2382,7 @@ proc hstrerror*(herrnum: cint): cstring {.importc, header: "<netdb.h>".}
proc FD_CLR*(a1: cint, a2: var TFdSet) {.importc, header: "<sys/select.h>".}
proc FD_ISSET*(a1: cint | SocketHandle, a2: var TFdSet): cint {.
importc, header: "<sys/select.h>".}
proc fdSet*(a1: cint | SocketHandle, a2: var TFdSet) {.
proc FD_SET*(a1: cint | SocketHandle, a2: var TFdSet) {.
importc: "FD_SET", header: "<sys/select.h>".}
proc FD_ZERO*(a1: var TFdSet) {.importc, header: "<sys/select.h>".}

10
lib/pure/asyncio.nim
View file

@ -91,11 +91,11 @@ import sockets, os
## getSocket(s).accept(client)
when defined(windows):
from winlean import TimeVal, SocketHandle, fdSet, FD_ZERO, TFdSet,
fdSet, FD_ISSET, select
from winlean import TimeVal, SocketHandle, FD_SET, FD_ZERO, TFdSet,
FD_ISSET, select
else:
from posix import TimeVal, SocketHandle, fdSet, FD_ZERO, TFdSet,
fdSet, FD_ISSET, select
from posix import TimeVal, SocketHandle, FD_SET, FD_ZERO, TFdSet,
FD_ISSET, select
type
DelegateObj* = object
@ -556,7 +556,7 @@ proc createFdSet(fd: var TFdSet, s: seq[Delegate], m: var int) =
FD_ZERO(fd)
for i in items(s):
m = max(m, int(i.fd))
fdSet(i.fd, fd)
FD_SET(i.fd, fd)
proc pruneSocketSet(s: var seq[Delegate], fd: var TFdSet) =
var i = 0

2
lib/pure/osproc.nim
View file

@ -887,7 +887,7 @@ elif not defined(useNimRtl):
FD_ZERO(fd)
for i in items(s):
m = max(m, int(i.outHandle))
fdSet(cint(i.outHandle), fd)
FD_SET(cint(i.outHandle), fd)
proc pruneProcessSet(s: var seq[Process], fd: var TFdSet) =
var i = 0

2
lib/pure/rawsockets.nim
View file

@ -372,7 +372,7 @@ proc createFdSet(fd: var TFdSet, s: seq[SocketHandle], m: var int) =
FD_ZERO(fd)
for i in items(s):
m = max(m, int(i))
fdSet(i, fd)
FD_SET(i, fd)
proc pruneSocketSet(s: var seq[SocketHandle], fd: var TFdSet) =
var i = 0

2
lib/pure/sockets.nim
View file

@ -936,7 +936,7 @@ proc createFdSet(fd: var TFdSet, s: seq[Socket], m: var int) =
FD_ZERO(fd)
for i in items(s):
m = max(m, int(i.fd))
fdSet(i.fd, fd)
FD_SET(i.fd, fd)
proc pruneSocketSet(s: var seq[Socket], fd: var TFdSet) =
var i = 0

2
lib/windows/winlean.nim
View file

@ -536,7 +536,7 @@ proc WSAFDIsSet(s: SocketHandle, set: var TFdSet): bool {.
proc FD_ISSET*(socket: SocketHandle, set: var TFdSet): cint =
result = if WSAFDIsSet(socket, set): 1'i32 else: 0'i32
proc fdSet*(socket: SocketHandle, s: var TFdSet) =
proc FD_SET*(socket: SocketHandle, s: var TFdSet) =
if s.fd_count < FD_SETSIZE:
s.fd_array[int(s.fd_count)] = socket
inc(s.fd_count)