Make clear when vtape is compiled in.

bareos · Feb 28, 2014 · abd2527 · abd2527
1 parent 1cb318d
commit abd2527
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/src/include/version.h b/src/include/version.h
@@ -93,13 +93,6 @@
 #undef _USE_LOCKMGR
 #endif
 
-/*
- * USE_VTAPE is a dummy tape driver. This is useful to run regress test.
- */
-#ifdef HAVE_LINUX_OS
-#define USE_VTAPE
-#endif
-
 /*
  * for fastest speed but you must have a UPS to avoid unwanted shutdowns
  */

diff --git a/src/stored/backends/vtape.c b/src/stored/backends/vtape.c
@@ -50,7 +50,7 @@ Device {
 
 #include "bareos.h"
 
-#ifdef USE_VTAPE
+#ifdef HAVE_LINUX_OS
 #include "stored.h"
 #include "backends/vtape.h"
 
@@ -926,4 +926,4 @@ void vtape::dump()
    Dmsg4(dbglevel+1, "EOF=%i EOT=%i EOD=%i BOT=%i\n",
          atEOF, atEOT, atEOD, atBOT);
 }
-#endif  /* ! USE_VTAPE */
+#endif  /* ! HAVE_LINUX_OS */
diff --git a/src/stored/dev.c b/src/stored/dev.c
@@ -72,7 +72,7 @@
 
 #include "bareos.h"
 #include "stored.h"
-#ifdef USE_VTAPE
+#ifdef HAVE_LINUX_OS
 #include "backends/vtape.h"
 #endif
 #ifdef HAVE_GFAPI
@@ -158,7 +158,7 @@ m_init_dev(JCR *jcr, DEVRES *device, bool new_init)
    }
 
    switch (device->dev_type) {
-#ifdef USE_VTAPE
+#ifdef HAVE_LINUX_OS
    case B_VTAPE_DEV:
       dev = New(vtape);
       break;