From 4cad40b4beba29b87204024e96839131d596a00e Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sun, 15 Apr 2007 14:00:42 +0000 Subject: [PATCH] Fix build without sd lock debug git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@4558 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/stored/dev.h | 2 +- bacula/src/stored/device.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/bacula/src/stored/dev.h b/bacula/src/stored/dev.h index a77b8e57ad..108389760d 100644 --- a/bacula/src/stored/dev.h +++ b/bacula/src/stored/dev.h @@ -387,7 +387,7 @@ public: void _dunlock(const char *, int); /* in device.c */ #else void r_dlock(); /* in device.c */ - void r_dunlock(); /* in device.c */ + void r_dunlock() { dunlock(); } void dlock() { P(m_mutex); } void dunlock() { V(m_mutex); } #endif diff --git a/bacula/src/stored/device.c b/bacula/src/stored/device.c index 7215c35cfc..4ea7232d39 100644 --- a/bacula/src/stored/device.c +++ b/bacula/src/stored/device.c @@ -352,6 +352,7 @@ bool is_device_unmounted(DEVICE *dev) return stat; } +#ifdef SD_DEBUG_LOCK void DEVICE::_dlock(const char *file, int line) { Dmsg4(sd_dbglvl, "dlock from %s:%d precnt=%d JobId=%u\n", file, line, @@ -375,16 +376,11 @@ void DEVICE::_dunlock(const char *file, int line) V(m_mutex); } -#ifdef SD_DEBUG_LOCK void DEVICE::_r_dunlock(const char *file, int line) { this->_dunlock(file, line); } -#else -void DEVICE::r_dunlock() -{ - this->dunlock(); -} + #endif -- 2.39.5