From 1c8ed1de0ecf1d0da67dd7341f90407c70f283b8 Mon Sep 17 00:00:00 2001 From: shirleyquirk <31934565+shirleyquirk@users.noreply.github.com> Date: Sat, 5 Sep 2020 22:00:59 +0100 Subject: [PATCH] Fix c_malloc inside syslocks.nim to take size_t (#15268) [backport] * update c_malloc's to csize_t (cherry picked from commit 57f98dae9a879bc6895d6bc4115180005f05f32c) --- lib/system/syslocks.nim | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/system/syslocks.nim b/lib/system/syslocks.nim index fa4164b95f..b7f7aa6bff 100644 --- a/lib/system/syslocks.nim +++ b/lib/system/syslocks.nim @@ -145,13 +145,13 @@ else: SysCond = ptr SysCondObj when not declared(c_malloc): - proc c_malloc(size: csize): pointer {. + proc c_malloc(size: csize_t): pointer {. importc: "malloc", header: "".} proc c_free(p: pointer) {. importc: "free", header: "".} proc initSysLock(L: var SysLock, attr: ptr SysLockAttr = nil) = - L = cast[SysLock](c_malloc(sizeof(SysLockObj))) + L = cast[SysLock](c_malloc(csize_t(sizeof(SysLockObj)))) initSysLockAux(L[], attr) proc deinitSys(L: var SysLock) = @@ -201,7 +201,7 @@ else: when defined(ios): proc initSysCond(cond: var SysCond, cond_attr: ptr SysCondAttr = nil) = - cond = cast[SysCond](c_malloc(sizeof(SysCondObj))) + cond = cast[SysCond](c_malloc(csize_t(sizeof(SysCondObj)))) initSysCondAux(cond[], cond_attr) proc deinitSysCond(cond: var SysCond) =