Merge branch 'devel' into async-improvements

2018-01-17 16:28:00 +00:00 · 2018-01-17 16:28:00 +00:00 · 47d05b3f2e
commit 47d05b3f2e
parent 5e43e0d789 399c5e38b7
201 changed files with 6604 additions and 2628 deletions
--- a/lib/pure/ioselects/ioselectors_kqueue.nim
+++ b/lib/pure/ioselects/ioselectors_kqueue.nim
@ -452,10 +452,10 @@ proc selectInto*[T](s: Selector[T], timeout: int,

  if timeout != -1:
    if timeout >= 1000:
-      tv.tv_sec = (timeout div 1_000).Time
+      tv.tv_sec = posix.Time(timeout div 1_000)
      tv.tv_nsec = (timeout %% 1_000) * 1_000_000
    else:
-      tv.tv_sec = 0.Time
+      tv.tv_sec = posix.Time(0)
      tv.tv_nsec = timeout * 1_000_000
  else:
    ptv = nil