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

Merge branch 'devel' of https://github.com/Araq/Nimrod into devel

Browse source
This commit is contained in:
Araq 2014-03-23 17:48:32 +01:00
commit e855f6c073
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/pure/rawsockets.nim
View file

@ -22,7 +22,8 @@ when defined(Windows):
export WSAEWOULDBLOCK export WSAEWOULDBLOCK
else: else:
import posix import posix
export fcntl, F_GETFL, O_NONBLOCK, F_SETFL, EAGAIN, EWOULDBLOCK export fcntl, F_GETFL, O_NONBLOCK, F_SETFL, EAGAIN, EWOULDBLOCK, MSG_NOSIGNAL,
EINTR, EINPROGRESS
export TSocketHandle, TSockaddr_in, TAddrinfo, INADDR_ANY, TSockAddr, TSockLen, export TSocketHandle, TSockaddr_in, TAddrinfo, INADDR_ANY, TSockAddr, TSockLen,
inet_ntoa, recv, `==`, connect, send, accept, recvfrom, sendto inet_ntoa, recv, `==`, connect, send, accept, recvfrom, sendto

2
tests/async/tasyncawait.nim
View file

@ -3,7 +3,7 @@ discard """
cmd: "nimrod cc --hints:on $# $#" cmd: "nimrod cc --hints:on $# $#"
output: "5000" output: "5000"
""" """
import asyncio2, sockets2, net, strutils, os import asyncdispatch, rawsockets, net, strutils, os
var disp = newDispatcher() var disp = newDispatcher()
var msgCount = 0 var msgCount = 0