kes Fix logic error in handling error return from mtx-changer

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

diff --git a/bacula/src/stored/stored.h b/bacula/src/stored/stored.h
index 10816451d40261ab6e1981ba81ba3c74636d899c..34569fff88850c38c852ea8d2bc749173c26b56c 100644 (file)
--- a/bacula/src/stored/stored.h
+++ b/bacula/src/stored/stored.h
@@ -8,7 +8,7 @@
 
    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 ammended with additional clauses defined in the
+   version 2 as amended with additional clauses defined in the
    file LICENSE in the main source directory.
 
    This program is distributed in the hope that it will be useful,
@@ -29,7 +29,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 +40,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 +66,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_ */