summaryrefslogtreecommitdiff
path: root/scsi.c
diff options
context:
space:
mode:
authorDmitry V. Levin <ldv@altlinux.org>2014-02-25 23:04:55 +0000
committerDmitry V. Levin <ldv@altlinux.org>2014-02-25 23:15:20 +0000
commitfdb896e577d4154b4dbd4350c9828e7df3b7da84 (patch)
tree1890a4a9eacf4212ff7031ff96d4f1f72a87ebae /scsi.c
parenta7c6e5143cef6d0b62e8812b8dee13f22e31d5db (diff)
downloadstrace-fdb896e577d4154b4dbd4350c9828e7df3b7da84.tar.gz
strace-fdb896e577d4154b4dbd4350c9828e7df3b7da84.tar.bz2
strace-fdb896e577d4154b4dbd4350c9828e7df3b7da84.tar.xz
Do not compile scsi ioctl decoding if <scsi/sg.h> is not available
Add a generic test for <scsi/sg.h> availability to fix build with Bionic libc that does not provide <scsi/sg.h>. * configure.ac (AC_CHECK_HEADERS): Add scsi/sg.h. * ioctl.c (ioctl_decode): Do not call scsi_ioctl if !HAVE_SCSI_SG_H. * scsi.c: Do not compile scsi ioctl decoding if !HAVE_SCSI_SG_H. Reported-by: Elliott Hughes <enh@google.com>
Diffstat (limited to 'scsi.c')
-rw-r--r--scsi.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/scsi.c b/scsi.c
index ed5b3bb..c49f954 100644
--- a/scsi.c
+++ b/scsi.c
@@ -27,8 +27,11 @@
*/
#include "defs.h"
-#include <sys/ioctl.h>
-#include <scsi/sg.h>
+
+#ifdef HAVE_SCSI_SG_H
+
+# include <sys/ioctl.h>
+# include <scsi/sg.h>
static const struct xlat sg_io_dxfer_direction[] = {
XLAT(SG_DXFER_NONE),
@@ -137,3 +140,5 @@ scsi_ioctl(struct tcb *tcp, long code, long arg)
}
return 1;
}
+
+#endif /* HAVE_SCSI_SG_H */