kes Clarify some stored/acquire messages to indicate if the

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

diff --git a/bacula/src/stored/stored.h b/bacula/src/stored/stored.h
index c75a523adcc80d6de3e22cd90490185b2d719114..0c458244cf21a0cc79a4b1f1366bf9ec191b0bcb 100644 (file)
--- a/bacula/src/stored/stored.h
+++ b/bacula/src/stored/stored.h
@@ -4,19 +4,32 @@
  *  Version $Id$
  */
 /*
-   Copyright (C) 2000-2005 Kern Sibbald
+   Bacula® - The Network Backup Solution
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   version 2 as amended with additional clauses defined in the
-   file LICENSE in the main source directory.
+   Copyright (C) 2000-2006 Free Software Foundation Europe e.V.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
-   the file LICENSE for additional details.
+   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
+   License as published by the Free Software Foundation plus additions
+   that are listed in the file LICENSE.
 
- */
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   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
+   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.
+   The licensor of Bacula is the Free Software Foundation Europe
+   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
+   Switzerland, email:ftf@fsfeurope.org.
+*/
 
 #ifndef __STORED_H_
 #define __STORED_H_
@@ -29,7 +42,7 @@
 # ifdef HAVE_SYS_MTIO_H
 # include <sys/mtio.h>
 # else
-#   ifdef HAVE_SYS_TAPE
+#   ifdef HAVE_SYS_TAPE_H
 #   include <sys/tape.h>
 #   endif
 # endif
@@ -40,6 +53,7 @@
 #include "stored_conf.h"
 #include "bsr.h"
 #include "jcr.h"
+#include "reserve.h"
 #include "protos.h"
 #ifdef HAVE_LIBZ
 #include <zlib.h>                     /* compression headers */
@@ -65,9 +79,4 @@ extern bool forge_on;                 /* proceed inspite of I/O errors */
 extern pthread_mutex_t device_release_mutex;
 extern pthread_cond_t wait_device_release; /* wait for any device to be released */                           
 
-#ifdef debug_tracing
-extern int _rewind_dev(char *file, int line, DEVICE *dev);
-#define rewind_dev(d) _rewind_dev(__FILE__, __LINE__, (d))
-#endif
-
 #endif /* __STORED_H_ */