diff options
| author | Jacek Sieka <arnetheduck@gmail.com> | 2016-08-25 22:59:51 +0800 |
|---|---|---|
| committer | Jacek Sieka <arnetheduck@gmail.com> | 2016-08-25 22:59:51 +0800 |
| commit | db2f96daba9c04db2f24cb783c79fb37799cd9ea (patch) | |
| tree | 567beb43c7e4549abfcae1ea66e5232d7525e001 /lib/deprecated/pure | |
| parent | 3116744c86f37ac4e4e5fec3d6d1635304ed717f (diff) | |
| parent | 84a09d2f5b0866491e55fef0fef541e8cc548852 (diff) | |
| download | Nim-db2f96daba9c04db2f24cb783c79fb37799cd9ea.tar.gz | |
Merge remote-tracking branch 'origin/devel' into initallocator-fix
Diffstat (limited to 'lib/deprecated/pure')
| -rw-r--r-- | lib/deprecated/pure/ftpclient.nim | 4 | ||||
| -rw-r--r-- | lib/deprecated/pure/sockets.nim | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/lib/deprecated/pure/ftpclient.nim b/lib/deprecated/pure/ftpclient.nim index 1188c0795..ed2f14450 100644 --- a/lib/deprecated/pure/ftpclient.nim +++ b/lib/deprecated/pure/ftpclient.nim @@ -129,10 +129,10 @@ proc ftpClient*(address: string, port = Port(21), result.csock = socket() if result.csock == invalidSocket: raiseOSError(osLastError()) -template blockingOperation(sock: Socket, body: stmt) {.immediate.} = +template blockingOperation(sock: Socket, body: untyped) = body -template blockingOperation(sock: asyncio.AsyncSocket, body: stmt) {.immediate.} = +template blockingOperation(sock: asyncio.AsyncSocket, body: untyped) = sock.setBlocking(true) body sock.setBlocking(false) diff --git a/lib/deprecated/pure/sockets.nim b/lib/deprecated/pure/sockets.nim index 20e6d9364..34c2e7a7d 100644 --- a/lib/deprecated/pure/sockets.nim +++ b/lib/deprecated/pure/sockets.nim @@ -711,8 +711,13 @@ proc getHostByAddr*(ip: string): Hostent {.tags: [ReadIOEffect].} = cint(sockets.AF_INET)) if s == nil: raiseOSError(osLastError()) else: - var s = posix.gethostbyaddr(addr(myaddr), sizeof(myaddr).Socklen, - cint(posix.AF_INET)) + var s = + when defined(android4): + posix.gethostbyaddr(cast[cstring](addr(myaddr)), sizeof(myaddr).cint, + cint(posix.AF_INET)) + else: + posix.gethostbyaddr(addr(myaddr), sizeof(myaddr).Socklen, + cint(posix.AF_INET)) if s == nil: raiseOSError(osLastError(), $hstrerror(h_errno)) |