summary refs log tree commit diff stats
path: root/lib/pure
diff options
context:
space:
mode:
authorAndreas Rumpf <rumpf_a@web.de>2014-10-21 21:48:56 +0200
committerAndreas Rumpf <rumpf_a@web.de>2014-10-21 21:48:56 +0200
commit72476e15941148f642ababad396de4898820c254 (patch)
tree9722194c74c965290361a50679ee6e86c4108889 /lib/pure
parent8910908effd53dae0d1d5555513937f891e7f7d1 (diff)
parent09f177e0ccdea872fb560e834efa897030cb06de (diff)
downloadNim-72476e15941148f642ababad396de4898820c254.tar.gz
Merge pull request #1566 from onionhammer/bigbreak
Fixed FD_SET casing
Diffstat (limited to 'lib/pure')
-rw-r--r--lib/pure/asyncio.nim10
-rw-r--r--lib/pure/osproc.nim2
-rw-r--r--lib/pure/rawsockets.nim2
-rw-r--r--lib/pure/sockets.nim2
4 files changed, 8 insertions, 8 deletions
diff --git a/lib/pure/asyncio.nim b/lib/pure/asyncio.nim
index bb0d29fc4..0dbc0a3d5 100644
--- a/lib/pure/asyncio.nim
+++ b/lib/pure/asyncio.nim
@@ -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
diff --git a/lib/pure/osproc.nim b/lib/pure/osproc.nim
index f47df73ca..0557b26f7 100644
--- a/lib/pure/osproc.nim
+++ b/lib/pure/osproc.nim
@@ -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
diff --git a/lib/pure/rawsockets.nim b/lib/pure/rawsockets.nim
index 5756ca23d..62a011999 100644
--- a/lib/pure/rawsockets.nim
+++ b/lib/pure/rawsockets.nim
@@ -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
diff --git a/lib/pure/sockets.nim b/lib/pure/sockets.nim
index 6975f07c0..36389edcc 100644
--- a/lib/pure/sockets.nim
+++ b/lib/pure/sockets.nim
@@ -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