diff options
| author | Dominik Picheta <dominikpicheta@googlemail.com> | 2013-10-23 18:30:03 +0100 |
|---|---|---|
| committer | Dominik Picheta <dominikpicheta@googlemail.com> | 2013-10-23 18:30:03 +0100 |
| commit | f695bb0b6f2447093696c837f92936b77fb6f60d (patch) | |
| tree | 7ce34bc7e4eea9ab8317ed2c813a1551fd257225 /lib | |
| parent | 8231deffd06952aa63a5f2dda0c5665ce90061ab (diff) | |
| download | Nim-f695bb0b6f2447093696c837f92936b77fb6f60d.tar.gz | |
Fixed socket compilation problems on Windows.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pure/sockets.nim | 4 | ||||
| -rw-r--r-- | lib/windows/winlean.nim | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/lib/pure/sockets.nim b/lib/pure/sockets.nim index d45c6ba3e..9c0cb98c7 100644 --- a/lib/pure/sockets.nim +++ b/lib/pure/sockets.nim @@ -130,10 +130,10 @@ let InvalidSocket*: TSocket = nil ## invalid socket when defined(windows): - const + let OSInvalidSocket = winlean.INVALID_SOCKET else: - const + let OSInvalidSocket = posix.INVALID_SOCKET proc newTSocket(fd: TSocketHandle, isBuff: bool): TSocket = diff --git a/lib/windows/winlean.nim b/lib/windows/winlean.nim index 6f72319ba..42571b789 100644 --- a/lib/windows/winlean.nim +++ b/lib/windows/winlean.nim @@ -334,6 +334,13 @@ const proc WSAGetLastError*(): cint {.importc: "WSAGetLastError", dynlib: ws2dll.} +when hostCPU == "amd64": + type + TSocketHandle* = distinct int # on WIN64 `SOCKET` is UINT_PTR +else: + type + TSocketHandle* = distinct cuint # on WIN32 `SOCKET` is U_INT (unsigned int) + type TWSAData* {.pure, final, importc: "WSADATA", header: "Winsock2.h".} = object wVersion, wHighVersion: int16 @@ -409,16 +416,9 @@ type Tsocklen* = cuint -when hostCPU == "amd64": - type - TSocketHandle* = distinct int # on WIN64 `SOCKET` is UINT_PTR -else: - type - TSocketHandle* = distinct cuint # on WIN32 `SOCKET` is U_INT (unsigned int) - var SOMAXCONN* {.importc, header: "Winsock2.h".}: cint - INVALID_SOCKET* {.importc, header: "Winsock2.h".}: cint + INVALID_SOCKET* {.importc, header: "Winsock2.h".}: TSocketHandle proc `==`*(x, y: TSocketHandle): bool {.borrow.} |