Merge branch 'upstream'

[debian/amanda] / changer-src / scsi-chio.c

diff --git a/changer-src/scsi-chio.c b/changer-src/scsi-chio.c
index 32c3dbb9d5d4d8160fd7c58c143aaf8f6a3568a7..d597b5e6535df03979bfc8e91a6f6447eaaa874d 100644 (file)
--- a/changer-src/scsi-chio.c
+++ b/changer-src/scsi-chio.c
@@ -13,6 +13,10 @@
 
 #include "config.h"
 #include "amanda.h"
+#include "scsi-defs.h"
+
+#if (defined(HAVE_CHIO_H) || defined(HAVE_SYS_CHIO_H)) \
+    && !defined(HAVE_CAMLIB_H)
 
 #include <sys/types.h>
 #include <sys/ioctl.h>