From a27429304e77ced5b9ba5729e47d6d6c7b7dae5c Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Wed, 19 Sep 2018 09:24:30 +0200
Subject: Convert *_family fields to cushort

Fixes #9008
---
 tests/async/tasyncawait.nim  | 5 +----
 tests/async/tnewasyncudp.nim | 5 +----
 tests/async/twinasyncrw.nim  | 2 +-
 tests/stdlib/tnet.nim        | 4 ++--
 4 files changed, 5 insertions(+), 11 deletions(-)

(limited to 'tests')

diff --git a/tests/async/tasyncawait.nim b/tests/async/tasyncawait.nim
index 74933f063..e7a2ec1d9 100644
--- a/tests/async/tasyncawait.nim
+++ b/tests/async/tasyncawait.nim
@@ -41,10 +41,7 @@ proc createServer(port: Port) {.async.} =
   var server = newAsyncNativeSocket()
   block:
     var name: Sockaddr_in
-    when defined(windows):
-      name.sin_family = toInt(AF_INET).int16
-    else:
-      name.sin_family = toInt(AF_INET)
+    name.sin_family = toInt(AF_INET).uint16
     name.sin_port = htons(uint16(port))
     name.sin_addr.s_addr = htonl(INADDR_ANY)
     if bindAddr(server.SocketHandle, cast[ptr SockAddr](addr(name)),
diff --git a/tests/async/tnewasyncudp.nim b/tests/async/tnewasyncudp.nim
index e61f630e4..b442c0524 100644
--- a/tests/async/tnewasyncudp.nim
+++ b/tests/async/tnewasyncudp.nim
@@ -29,10 +29,7 @@ proc saveReceivedPort(port: int) =
 
 proc prepareAddress(intaddr: uint32, intport: uint16): ptr Sockaddr_in =
   result = cast[ptr Sockaddr_in](alloc0(sizeof(Sockaddr_in)))
-  when defined(windows):
-    result.sin_family = toInt(nativesockets.AF_INET).int16
-  else:
-    result.sin_family = toInt(nativesockets.AF_INET)
+  result.sin_family = toInt(nativesockets.AF_INET).uint16
   result.sin_port = nativesockets.htons(intport)
   result.sin_addr.s_addr = nativesockets.htonl(intaddr)
 
diff --git a/tests/async/twinasyncrw.nim b/tests/async/twinasyncrw.nim
index 42a7e3058..94193e921 100644
--- a/tests/async/twinasyncrw.nim
+++ b/tests/async/twinasyncrw.nim
@@ -234,7 +234,7 @@ when defined(windows):
     setBlocking(server, false)
     block:
       var name = Sockaddr_in()
-      name.sin_family = toInt(Domain.AF_INET).int16
+      name.sin_family = toInt(Domain.AF_INET).uint16
       name.sin_port = htons(uint16(port))
       name.sin_addr.s_addr = htonl(INADDR_ANY)
       if bindAddr(server, cast[ptr SockAddr](addr(name)),
diff --git a/tests/stdlib/tnet.nim b/tests/stdlib/tnet.nim
index d364447da..009561272 100644
--- a/tests/stdlib/tnet.nim
+++ b/tests/stdlib/tnet.nim
@@ -66,11 +66,11 @@ block: # "IpAddress/Sockaddr conversion"
     doAssert(ipaddr_1 == ipaddr_2)
     doAssert($ipaddr_1 == $ipaddr_2)
 
-    if sockaddr.ss_family == AF_INET.toInt:
+    if sockaddr.ss_family.cint == AF_INET.toInt:
       var sockaddr4: Sockaddr_in
       copyMem(addr sockaddr4, addr sockaddr, sizeof(sockaddr4))
       fromSockAddr(sockaddr4, socklen, ipaddr_2, port_2)
-    elif sockaddr.ss_family == AF_INET6.toInt:
+    elif sockaddr.ss_family.cint == AF_INET6.toInt:
       var sockaddr6: Sockaddr_in6
       copyMem(addr sockaddr6, addr sockaddr, sizeof(sockaddr6))
       fromSockAddr(sockaddr6, socklen, ipaddr_2, port_2)
-- 
cgit 1.4.1-2-gfad0