Merge branch 'devel' into gogc

1 files changed, 14 insertions, 12 deletions

diff --git a/lib/core/locks.nim b/lib/core/locks.nim
index 92ae24a37..12f289e74 100644
--- a/lib/core/locks.nim
+++ b/lib/core/locks.nim
@@ -12,44 +12,46 @@
 include "system/syslocks"
 
 type
-  TLock* = TSysLock ## Nim lock; whether this is re-entrant
+  Lock* = SysLock ## Nim lock; whether this is re-entrant
                     ## or not is unspecified!
-  TCond* = TSysCond ## Nim condition variable
 
-proc initLock*(lock: var TLock) {.inline.} =
+  Cond* = SysCond ## Nim condition variable
+
+{.deprecated: [TLock: Lock, TCond: Cond].}
+
+proc initLock*(lock: var Lock) {.inline.} =
   ## Initializes the given lock.
   initSysLock(lock)
 
-proc deinitLock*(lock: var TLock) {.inline.} =
+proc deinitLock*(lock: var Lock) {.inline.} =
   ## Frees the resources associated with the lock.
   deinitSys(lock)
 
-proc tryAcquire*(lock: var TLock): bool =
+proc tryAcquire*(lock: var Lock): bool =
   ## Tries to acquire the given lock. Returns `true` on success.
   result = tryAcquireSys(lock)
 
-proc acquire*(lock: var TLock) =
+proc acquire*(lock: var Lock) =
   ## Acquires the given lock.
   acquireSys(lock)
 
-proc release*(lock: var TLock) =
+proc release*(lock: var Lock) =
   ## Releases the given lock.
   releaseSys(lock)
 
 
-proc initCond*(cond: var TCond) {.inline.} =
+proc initCond*(cond: var Cond) {.inline.} =
   ## Initializes the given condition variable.
   initSysCond(cond)
 
-proc deinitCond*(cond: var TCond) {.inline.} =
+proc deinitCond*(cond: var Cond) {.inline.} =
   ## Frees the resources associated with the lock.
   deinitSysCond(cond)
 
-proc wait*(cond: var TCond, lock: var TLock) {.inline.} =
+proc wait*(cond: var Cond, lock: var Lock) {.inline.} =
   ## waits on the condition variable `cond`.
   waitSysCond(cond, lock)
 
-proc signal*(cond: var TCond) {.inline.} =
+proc signal*(cond: var Cond) {.inline.} =
   ## sends a signal to the condition variable `cond`.
   signalSysCond(cond)
-