stdlib: don't use deprecated symbols
This commit is contained in:
parent
e0ecaa86ba
commit
ccb9ae2d52
4 changed files with 52 additions and 52 deletions
|
|
@ -439,7 +439,7 @@ type
|
|||
h_length*: int16
|
||||
h_addr_list*: cstringArray
|
||||
|
||||
FdSet* = object
|
||||
TFdSet* = object
|
||||
fd_count*: cint # unsigned
|
||||
fd_array*: array[0..FD_SETSIZE-1, SocketHandle]
|
||||
|
||||
|
|
@ -461,7 +461,7 @@ type
|
|||
TSockAddr: SockAddr, TSockLen: SockLen, TTimeval: Timeval,
|
||||
TWSADATA: WSADATA, Thostent: Hostent, TServent: Servent,
|
||||
TInAddr: InAddr, Tin6_addr: In6_addr, Tsockaddr_in6: Sockaddr_in6,
|
||||
Tsockaddr_in6_old: Sockaddr_in6_old, TFdSet: FdSet].}
|
||||
Tsockaddr_in6_old: Sockaddr_in6_old].}
|
||||
|
||||
|
||||
var
|
||||
|
|
@ -525,7 +525,7 @@ proc recv*(s: SocketHandle, buf: pointer, len, flags: cint): cint {.
|
|||
proc recvfrom*(s: SocketHandle, buf: cstring, len, flags: cint,
|
||||
fromm: ptr SockAddr, fromlen: ptr SockLen): cint {.
|
||||
stdcall, importc: "recvfrom", dynlib: ws2dll.}
|
||||
proc select*(nfds: cint, readfds, writefds, exceptfds: ptr FdSet,
|
||||
proc select*(nfds: cint, readfds, writefds, exceptfds: ptr TFdSet,
|
||||
timeout: ptr Timeval): cint {.
|
||||
stdcall, importc: "select", dynlib: ws2dll.}
|
||||
proc send*(s: SocketHandle, buf: pointer, len, flags: cint): cint {.
|
||||
|
|
@ -545,18 +545,18 @@ proc getnameinfo*(a1: ptr SockAddr, a2: SockLen,
|
|||
proc inet_addr*(cp: cstring): int32 {.
|
||||
stdcall, importc: "inet_addr", dynlib: ws2dll.}
|
||||
|
||||
proc WSAFDIsSet(s: SocketHandle, set: var FdSet): bool {.
|
||||
proc WSAFDIsSet(s: SocketHandle, set: var TFdSet): bool {.
|
||||
stdcall, importc: "__WSAFDIsSet", dynlib: ws2dll, noSideEffect.}
|
||||
|
||||
proc FD_ISSET*(socket: SocketHandle, set: var FdSet): cint =
|
||||
proc FD_ISSET*(socket: SocketHandle, set: var TFdSet): cint =
|
||||
result = if WSAFDIsSet(socket, set): 1'i32 else: 0'i32
|
||||
|
||||
proc FD_SET*(socket: SocketHandle, s: var FdSet) =
|
||||
proc FD_SET*(socket: SocketHandle, s: var TFdSet) =
|
||||
if s.fd_count < FD_SETSIZE:
|
||||
s.fd_array[int(s.fd_count)] = socket
|
||||
inc(s.fd_count)
|
||||
|
||||
proc FD_ZERO*(s: var FdSet) =
|
||||
proc FD_ZERO*(s: var TFdSet) =
|
||||
s.fd_count = 0
|
||||
|
||||
proc wsaStartup*(wVersionRequired: int16, WSData: ptr WSAData): cint {.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue