Fix build without sd lock debug

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@4558 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/stored/dev.h b/bacula/src/stored/dev.h
index a77b8e57ad86a9ded62303e2906e42dade65cd79..108389760d69b636f6ca45b64e357eac8b44f83c 100644 (file)
--- 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 7215c35cfcfc626c90f15de8dc443fa9507bf92a..4ea7232d3972a8529b09bd9eaccecd7848c40352 100644 (file)
--- 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