Integrate Nicolas' patch for direct DVD support.

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

diff --git a/bacula/src/stored/stored.h b/bacula/src/stored/stored.h
index a74db4da166d406804aeb3aff2a17733824c1e26..cfd68b0e834861c74f075df13766fdf171991e83 100644 (file)
--- a/bacula/src/stored/stored.h
+++ b/bacula/src/stored/stored.h
@@ -4,7 +4,7 @@
  *  Version $Id$
  */
 /*
-   Copyright (C) 2000-2003 Kern Sibbald and John Walker
+   Copyright (C) 2000-2005 Kern Sibbald
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -30,9 +30,14 @@
 
 #ifdef HAVE_MTIO_H
 #include <mtio.h>
-#endif
-#ifdef HAVE_SYS_MTIO_H
-#include <sys/mtio.h>
+#else
+# ifdef HAVE_SYS_MTIO_H
+# include <sys/mtio.h>
+# else
+#   ifdef HAVE_SYS_TAPE
+#   include <sys/tape.h>
+#   endif
+# endif
 #endif
 #include "block.h"
 #include "record.h"
@@ -42,14 +47,25 @@
 #include "jcr.h"
 #include "protos.h"
 #ifdef HAVE_LIBZ
-#include <zlib.h>                     /* compression headers */
+#include <zlib.h>                    /* compression headers */
 #else
 #define uLongf uint32_t
 #endif
-
-extern char errmsg[];                 /* general error message */
+#ifdef HAVE_FNMATCH
+#include <fnmatch.h>
+#else
+#include "lib/fnmatch.h"
+#endif
+#ifdef HAVE_DIRENT_H
+#include <dirent.h>
+#define NAMELEN(dirent) (strlen((dirent)->d_name))
+#endif
+#ifndef HAVE_READDIR_R
+int readdir_r(DIR *dirp, struct dirent *entry, struct dirent **result);
+#endif
 
 extern STORES *me;                    /* "Global" daemon resource */
+extern bool forge_on;                /* proceed inspite of I/O errors */
 
 #ifdef debug_tracing
 extern int _rewind_dev(char *file, int line, DEVICE *dev);