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

fix rlock compilation failure (#15584)

Browse source 
* change SysLockType_Reentrant

fix edge case where using SysLockType_Reentrant doesn't trigger an #include pthread.h

* syslocktype_reentrant now a var
* remove nodecl to remove empty system_syslocks.c
* let is better than var.

in reality SysLockType = enum, maybe that would be a better fix
This commit is contained in:
shirleyquirk 2020-10-15 11:54:01 +01:00 • committed by GitHub
commit 4ef255b69d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/core/rlocks.nim
View file

@ -24,7 +24,7 @@ proc initRLock*(lock: var RLock) {.inline.} =
when defined(posix): when defined(posix):
var a: SysLockAttr var a: SysLockAttr
initSysLockAttr(a) initSysLockAttr(a)
setSysLockType(a, SysLockType_Reentrant()) setSysLockType(a, SysLockType_Reentrant)
initSysLock(lock, a.addr) initSysLock(lock, a.addr)
else: else:
initSysLock(lock) initSysLock(lock)

4
lib/system/syslocks.nim
View file

@ -181,8 +181,8 @@ else:
releaseSysAux(L) releaseSysAux(L)
when insideRLocksModule: when insideRLocksModule:
proc SysLockType_Reentrant: SysLockType = let SysLockType_Reentrant{.importc: "PTHREAD_MUTEX_RECURSIVE",
{.emit: "`result` = PTHREAD_MUTEX_RECURSIVE;".} header: "<pthread.h>".}: SysLockType
proc initSysLockAttr(a: var SysLockAttr) {. proc initSysLockAttr(a: var SysLockAttr) {.
importc: "pthread_mutexattr_init", header: "<pthread.h>", noSideEffect.} importc: "pthread_mutexattr_init", header: "<pthread.h>", noSideEffect.}
proc setSysLockType(a: var SysLockAttr, t: SysLockType) {. proc setSysLockType(a: var SysLockAttr, t: SysLockType) {.