From: Eric Bollengier Date: Tue, 6 Apr 2010 19:41:31 +0000 (+0200) Subject: Permits to use lock manager with file/line from outside X-Git-Tag: Release-7.0.0~1987 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7b28b397161d80a2f11d258788f1db3dd0e080a2;p=bacula%2Fbacula Permits to use lock manager with file/line from outside --- diff --git a/bacula/src/lib/lockmgr.h b/bacula/src/lib/lockmgr.h index 008ba37da8..64ccbd31fe 100644 --- a/bacula/src/lib/lockmgr.h +++ b/bacula/src/lib/lockmgr.h @@ -196,11 +196,13 @@ int lmgr_thread_create(pthread_t *thread, # define lmgr_do_unlock(m) # define lmgr_cleanup_main() # define bthread_mutex_set_priority(a,b) -# define bthread_mutex_lock(a) pthread_mutex_lock(a) -# define bthread_mutex_unlock(a) pthread_mutex_unlock(a) -# define lmgr_cond_wait(a,b) pthread_cond_wait(a,b) -# define lmgr_cond_timedwait(a,b,c) pthread_cond_timedwait(a,b,c) -# define bthread_mutex_t pthread_mutex_t +# define bthread_mutex_lock(a) pthread_mutex_lock(a) +# define bthread_mutex_lock_p(a, f, l) pthread_mutex_lock(a) +# define bthread_mutex_unlock(a) pthread_mutex_unlock(a) +# define bthread_mutex_unlock_p(a, f, l) pthread_mutex_unlock(a) +# define lmgr_cond_wait(a,b) pthread_cond_wait(a,b) +# define lmgr_cond_timedwait(a,b,c) pthread_cond_timedwait(a,b,c) +# define bthread_mutex_t pthread_mutex_t # define P(x) lmgr_p(&(x)) # define V(x) lmgr_v(&(x)) # define BTHREAD_MUTEX_PRIORITY(p) PTHREAD_MUTEX_INITIALIZER