From a7edf1f7c029a4b48a79e7f56a51bf4767b7875e Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 5 Mar 2009 23:15:15 +0000 Subject: [PATCH] Moved RECURSIVE_LOCK_HOLDER() macro to the header and fixed it. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29407 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/private/kernel/lock.h | 7 +++++++ src/system/kernel/lock.cpp | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/headers/private/kernel/lock.h b/headers/private/kernel/lock.h index 0b0d6c758b..e7fb41359f 100644 --- a/headers/private/kernel/lock.h +++ b/headers/private/kernel/lock.h @@ -88,6 +88,13 @@ typedef struct rw_lock { #define RW_LOCK_INITIALIZER(name) { name, NULL, -1, 0, 0, 0 } +#if KDEBUG +# define RECURSIVE_LOCK_HOLDER(recursiveLock) ((recursiveLock)->lock.holder) +#else +# define RECURSIVE_LOCK_HOLDER(recursiveLock) ((recursiveLock)->holder) +#endif + + #ifdef __cplusplus extern "C" { #endif diff --git a/src/system/kernel/lock.cpp b/src/system/kernel/lock.cpp index f9b2ae4b69..f2b0cc4c0b 100644 --- a/src/system/kernel/lock.cpp +++ b/src/system/kernel/lock.cpp @@ -43,13 +43,6 @@ struct rw_lock_waiter { #define RW_LOCK_FLAG_OWNS_NAME RW_LOCK_FLAG_CLONE_NAME -#if KDEBUG -# define RECURSIVE_LOCK_HOLDER(lock) ((lock)->lock.holder) -#else -# define RECURSIVE_LOCK_HOLDER(lock) ((lock)->holder) -#endif - - int32 recursive_lock_get_recursion(recursive_lock *lock) {