diff options
| -rw-r--r-- | lib/pure/concurrency/cpuinfo.nim | 5 | ||||
| -rw-r--r-- | lib/pure/ioselects/ioselectors_kqueue.nim | 10 | ||||
| -rw-r--r-- | lib/pure/os.nim | 6 |
3 files changed, 10 insertions, 11 deletions
diff --git a/lib/pure/concurrency/cpuinfo.nim b/lib/pure/concurrency/cpuinfo.nim index a3d78db61..515d7e2da 100644 --- a/lib/pure/concurrency/cpuinfo.nim +++ b/lib/pure/concurrency/cpuinfo.nim @@ -29,7 +29,7 @@ when defined(macosx) or defined(bsd): HW_AVAILCPU = 25 HW_NCPU = 3 proc sysctl(x: ptr array[0..3, cint], y: cint, z: pointer, - a: var csize, b: pointer, c: int): cint {. + a: var csize_t, b: pointer, c: csize_t): cint {. importc: "sysctl", nodecl.} when defined(genode): @@ -73,10 +73,9 @@ proc countProcessors*(): int {.rtl, extern: "ncpi$1".} = var mib: array[0..3, cint] numCPU: int - len: csize mib[0] = CTL_HW mib[1] = HW_AVAILCPU - len = sizeof(numCPU) + var len = sizeof(numCPU).csize_t discard sysctl(addr(mib), 2, addr(numCPU), len, nil, 0) if numCPU < 1: mib[1] = HW_NCPU diff --git a/lib/pure/ioselects/ioselectors_kqueue.nim b/lib/pure/ioselects/ioselectors_kqueue.nim index 65dc0c496..83e15d479 100644 --- a/lib/pure/ioselects/ioselectors_kqueue.nim +++ b/lib/pure/ioselects/ioselectors_kqueue.nim @@ -27,8 +27,8 @@ when defined(macosx) or defined(freebsd) or defined(dragonfly): const MAX_DESCRIPTORS_ID = 29 # KERN_MAXFILESPERPROC (MacOS) else: const MAX_DESCRIPTORS_ID = 27 # KERN_MAXFILESPERPROC (FreeBSD) - proc sysctl(name: ptr cint, namelen: cuint, oldp: pointer, oldplen: ptr csize, - newp: pointer, newplen: csize): cint + proc sysctl(name: ptr cint, namelen: cuint, oldp: pointer, oldplen: ptr csize_t, + newp: pointer, newplen: csize_t): cint {.importc: "sysctl",header: """#include <sys/types.h> #include <sys/sysctl.h>"""} elif defined(netbsd) or defined(openbsd): @@ -36,8 +36,8 @@ elif defined(netbsd) or defined(openbsd): # KERN_MAXFILES, because KERN_MAXFILES is always bigger, # than KERN_MAXFILESPERPROC. const MAX_DESCRIPTORS_ID = 7 # KERN_MAXFILES - proc sysctl(name: ptr cint, namelen: cuint, oldp: pointer, oldplen: ptr csize, - newp: pointer, newplen: csize): cint + proc sysctl(name: ptr cint, namelen: cuint, oldp: pointer, oldplen: ptr csize_t, + newp: pointer, newplen: csize_t): cint {.importc: "sysctl",header: """#include <sys/param.h> #include <sys/sysctl.h>"""} @@ -82,7 +82,7 @@ proc getUnique[T](s: Selector[T]): int {.inline.} = proc newSelector*[T](): owned(Selector[T]) = var maxFD = 0.cint - var size = csize(sizeof(cint)) + var size = csize_t(sizeof(cint)) var namearr = [1.cint, MAX_DESCRIPTORS_ID.cint] # Obtain maximum number of opened file descriptors for process if sysctl(addr(namearr[0]), 2, cast[pointer](addr maxFD), addr size, diff --git a/lib/pure/os.nim b/lib/pure/os.nim index 9087cfec6..abb1b4a19 100644 --- a/lib/pure/os.nim +++ b/lib/pure/os.nim @@ -2725,8 +2725,8 @@ when declared(paramCount) or defined(nimdoc): result.add(paramStr(i)) when not weirdTarget and (defined(freebsd) or defined(dragonfly)): - proc sysctl(name: ptr cint, namelen: cuint, oldp: pointer, oldplen: ptr csize, - newp: pointer, newplen: csize): cint + proc sysctl(name: ptr cint, namelen: cuint, oldp: pointer, oldplen: ptr csize_t, + newp: pointer, newplen: csize_t): cint {.importc: "sysctl",header: """#include <sys/types.h> #include <sys/sysctl.h>"""} const @@ -2740,7 +2740,7 @@ when not weirdTarget and (defined(freebsd) or defined(dragonfly)): const KERN_PROC_PATHNAME = 9 proc getApplFreebsd(): string = - var pathLength = csize(MAX_PATH) + var pathLength = csize_t(MAX_PATH) result = newString(pathLength) var req = [CTL_KERN.cint, KERN_PROC.cint, KERN_PROC_PATHNAME.cint, -1.cint] while true: |