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

Merge branch 'devel' of github.com:nim-lang/Nim into devel

Browse source
This commit is contained in:
Dominik Picheta 2016-04-04 12:06:42 +01:00
commit 436b003173
28 changed files with 463 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/system.nim
View file

@ -2877,6 +2877,7 @@ when not defined(JS): #and not defined(nimscript):
when declared(initAllocator):
initAllocator()
when hasThreadSupport:
const insideRLocksModule = false
include "system/syslocks"
when hostOS != "standalone": include "system/threads"
elif not defined(nogc) and not defined(nimscript):