Merge branch 'master' of ssh://bacula.git.sourceforge.net/gitroot/bacula

diff --git a/bacula/src/lib/lockmgr.h b/bacula/src/lib/lockmgr.h
index 173c90537223ad0c2e0916e48f400715a27c6cb9..697b84483826ce8da3caa237dbff40982a62f7e4 100644 (file)
--- a/bacula/src/lib/lockmgr.h
+++ b/bacula/src/lib/lockmgr.h
@@ -138,9 +138,9 @@ int lmgr_thread_create(pthread_t *thread,
 # define lmgr_dump()
 # define lmgr_init_thread()
 # define lmgr_cleanup_thread()
-# define lmgr_pre_lock(m)
+# define lmgr_pre_lock(m, f, l)
 # define lmgr_post_lock()
-# define lmgr_do_lock(m)
+# define lmgr_do_lock(m, f, l)
 # define lmgr_do_unlock(m)
 # define lmgr_cleanup_main()
 # define P(x) lmgr_p(&(x))