Refactor lock_volumes so most lock a vol rather than globally

[bacula/bacula] / bacula / src / stored / stored.h

diff --git a/bacula/src/stored/stored.h b/bacula/src/stored/stored.h
index edc2bb9944e45a500e7b918b0a164935adba30c6..2af78c4dcab09a35bee11a939c3f8780d11db5a9 100644 (file)
--- a/bacula/src/stored/stored.h
+++ b/bacula/src/stored/stored.h
@@ -1,12 +1,12 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2008 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2013 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
    This program is Free Software; you can redistribute it and/or
-   modify it under the terms of version two of the GNU General Public
+   modify it under the terms of version three of the GNU Affero General Public
    License as published by the Free Software Foundation and included
    in the file LICENSE.
 
@@ -15,12 +15,12 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
    General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
+   You should have received a copy of the GNU Affero General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Bacula® is a registered trademark of John Walker.
+   Bacula® is a registered trademark of Kern Sibbald.
    The licensor of Bacula is the Free Software Foundation Europe
    (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
    Switzerland, email:ftf@fsfeurope.org.
@@ -28,7 +28,6 @@
 /*
  * Storage daemon specific defines and includes
  *
- *  Version $Id$
  */
 
 #ifndef __STORED_H_
@@ -38,7 +37,11 @@
 
 /* Set to debug mutexes */
 //#define SD_DEBUG_LOCK
+#ifdef SD_DEBUG_LOCK
+const int sd_dbglvl = 3;
+#else
 const int sd_dbglvl = 300;
+#endif
 
 #ifdef HAVE_MTIO_H
 #include <mtio.h>
@@ -48,6 +51,9 @@ const int sd_dbglvl = 300;
 # else
 #   ifdef HAVE_SYS_TAPE_H
 #   include <sys/tape.h>
+#   else
+    /* Needed for Mac 10.6 (Snow Leopard) */
+#   include "lib/bmtio.h"
 #   endif
 # endif
 #endif
@@ -58,6 +64,7 @@ const int sd_dbglvl = 300;
 #include "stored_conf.h"
 #include "bsr.h"
 #include "jcr.h"
+#include "vol_mgr.h"
 #include "reserve.h"
 #include "protos.h"
 #ifdef HAVE_LIBZ
@@ -65,6 +72,10 @@ const int sd_dbglvl = 300;
 #else
 #define uLongf uint32_t
 #endif
+#ifdef HAVE_LZO
+#include <lzo/lzoconf.h>
+#include <lzo/lzo1x.h>
+#endif
 #ifdef HAVE_FNMATCH
 #include <fnmatch.h>
 #else
@@ -79,7 +90,7 @@ int readdir_r(DIR *dirp, struct dirent *entry, struct dirent **result);
 #endif
 
 #include "vtape.h"
-
+#include "sd_plugins.h"
 
 /* Daemon globals from stored.c */
 extern STORES *me;                    /* "Global" daemon resource */