diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2010-04-11 19:01:46 +0000 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2010-04-11 19:01:46 +0000 |
| commit | 75042f3c55848f0f29a3f58e389f476741624a33 (patch) | |
| tree | 7fbdd3a57d1246ae4d0b7f7f899f37f84a90af2a /libgphoto2_port/usbscsi | |
| parent | d16b14109a408ca4fa13b29ab557a0f9db58f73a (diff) | |
| download | libgphoto2-75042f3c55848f0f29a3f58e389f476741624a33.tar.gz | |
added scsi/sg.h autoconf checking
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@12992 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'libgphoto2_port/usbscsi')
| -rw-r--r-- | libgphoto2_port/usbscsi/linux.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/libgphoto2_port/usbscsi/linux.c b/libgphoto2_port/usbscsi/linux.c index 6bf8df62c..ad9c0ee6a 100644 --- a/libgphoto2_port/usbscsi/linux.c +++ b/libgphoto2_port/usbscsi/linux.c @@ -27,8 +27,12 @@ #include <sys/stat.h> #include <sys/types.h> #include <sys/param.h> -#include <sys/ioctl.h> -#include <scsi/sg.h> +#ifdef HAVE_SYS_IOCTL_H +# include <sys/ioctl.h> +#endif +#ifdef HAVE_SCSI_SG_H +# include <scsi/sg.h> +#endif #ifdef HAVE_LOCKDEV # include <lockdev.h> #endif @@ -297,6 +301,7 @@ gp_port_usbscsi_close (GPPort *port) static int gp_port_usbscsi_send_scsi_cmd (GPPort *port, int to_dev, char *cmd, int cmd_size, char *sense, int sense_size, char *data, int data_size) { +#ifdef HAVE_SCSI_SG_H sg_io_hdr_t io_hdr; if (!port) @@ -328,6 +333,9 @@ static int gp_port_usbscsi_send_scsi_cmd (GPPort *port, int to_dev, char *cmd, } return GP_OK; +#else + return GP_ERROR_NOT_SUPPORTED; +#endif } static int |