jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixup #5804 (#5837)

Browse source
This commit is contained in:
Yuriy Glukhov 2017-05-18 14:12:43 +03:00 • committed by Andreas Rumpf
commit 2b8a1cee8c
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/system/syslocks.nim
View file

@ -117,6 +117,12 @@ else:
when defined(linux) and defined(amd64): when defined(linux) and defined(amd64):
abi: array[48 div sizeof(clonglong), clonglong] abi: array[48 div sizeof(clonglong), clonglong]
SysCondAttr {.importc: "pthread_condattr_t", pure, final
header: """#include <sys/types.h>
#include <pthread.h>""".} = object
when defined(linux) and defined(amd64):
abi: array[4 div sizeof(cint), cint] # actually a cint
SysLockType = distinct cint SysLockType = distinct cint
proc initSysLockAux(L: var SysLockObj, attr: ptr SysLockAttr) {. proc initSysLockAux(L: var SysLockObj, attr: ptr SysLockAttr) {.
@ -185,7 +191,7 @@ else:
importc: "pthread_mutexattr_settype", header: "<pthread.h>", noSideEffect.} importc: "pthread_mutexattr_settype", header: "<pthread.h>", noSideEffect.}
else: else:
proc initSysCondAux(cond: var SysCondObj, cond_attr: pointer) {. proc initSysCondAux(cond: var SysCondObj, cond_attr: ptr SysCondAttr = nil) {.
importc: "pthread_cond_init", header: "<pthread.h>", noSideEffect.} importc: "pthread_cond_init", header: "<pthread.h>", noSideEffect.}
proc deinitSysCondAux(cond: var SysCondObj) {.noSideEffect, proc deinitSysCondAux(cond: var SysCondObj) {.noSideEffect,
importc: "pthread_cond_destroy", header: "<pthread.h>".} importc: "pthread_cond_destroy", header: "<pthread.h>".}
@ -196,7 +202,7 @@ else:
importc: "pthread_cond_signal", header: "<pthread.h>", noSideEffect.} importc: "pthread_cond_signal", header: "<pthread.h>", noSideEffect.}
when defined(ios): when defined(ios):
proc initSysCond(cond: var SysCond, cond_attr: pointer = nil) = proc initSysCond(cond: var SysCond, cond_attr: ptr SysCondAttr = nil) =
cond = cast[SysCond](c_malloc(sizeof(SysCondObj))) cond = cast[SysCond](c_malloc(sizeof(SysCondObj)))
initSysCondAux(cond[], cond_attr) initSysCondAux(cond[], cond_attr)
@ -209,7 +215,7 @@ else:
template signalSysCond(cond: var SysCond) = template signalSysCond(cond: var SysCond) =
signalSysCondAux(cond[]) signalSysCondAux(cond[])
else: else:
template initSysCond(cond: var SysCond, cond_attr: pointer = nil) = template initSysCond(cond: var SysCond, cond_attr: ptr SysCondAttr = nil) =
initSysCondAux(cond, cond_attr) initSysCondAux(cond, cond_attr)
template deinitSysCond(cond: var SysCond) = template deinitSysCond(cond: var SysCond) =
deinitSysCondAux(cond) deinitSysCondAux(cond)