From 1dab8ba334a1b53f3c8780bc8a4f8045a6ea0375 Mon Sep 17 00:00:00 2001 From: ringabout <43030857+ringabout@users.noreply.github.com> Date: Sun, 30 Oct 2022 00:11:40 +0800 Subject: move threads out of system (#20674) * move syslocks first * progress * clean up * go on * clean up * clean up * add imports syslocks * remove documentation * public deallocOsPages * fixes genode * fixes more * fixes boehmGC * cover more cases * fixes cyclic deps * fixes genode * cleanup * unpublic fields * cleanup * clean up --- lib/core/locks.nim | 3 +-- lib/core/rlocks.nim | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'lib/core') diff --git a/lib/core/locks.nim b/lib/core/locks.nim index 92967b9db..ad0bff44d 100644 --- a/lib/core/locks.nim +++ b/lib/core/locks.nim @@ -18,8 +18,7 @@ when not compileOption("threads") and not defined(nimdoc): when false: # fix #12330 {.error: "Locks requires --threads:on option.".} -const insideRLocksModule = false -include "system/syslocks" +import std/private/syslocks type Lock* = SysLock ## Nim lock; whether this is re-entrant diff --git a/lib/core/rlocks.nim b/lib/core/rlocks.nim index 0444b9a83..bee5c1655 100644 --- a/lib/core/rlocks.nim +++ b/lib/core/rlocks.nim @@ -16,8 +16,7 @@ when not compileOption("threads") and not defined(nimdoc): # so they can replace each other seamlessly. {.error: "Rlocks requires --threads:on option.".} -const insideRLocksModule = true -include "system/syslocks" +import std/private/syslocks type RLock* = SysLock ## Nim lock, re-entrant -- cgit 1.4.1-2-gfad0