From 58912f68c2489bcee787599837447e0d64dfd61a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 24 May 2017 21:03:56 +0200 Subject: New upstream version 1.0.27 --- sanei/sanei_scsi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sanei/sanei_scsi.c') diff --git a/sanei/sanei_scsi.c b/sanei/sanei_scsi.c index 6d171d3..2413d8f 100644 --- a/sanei/sanei_scsi.c +++ b/sanei/sanei_scsi.c @@ -96,7 +96,7 @@ #elif defined (HAVE__USR_SRC_LINUX_INCLUDE_SCSI_SG_H) # define USE LINUX_INTERFACE # include "/usr/src/linux/include/scsi/sg.h" -#elif defined (HAVE_SYS_SCSICMD) +#elif defined (HAVE_SYS_SCSICMD_H) # define USE SCSO_OS5_INTERFACE # include # include @@ -2719,7 +2719,7 @@ sanei_proc_scsi_find_devices (const char *findvendor, const char *findmodel, int number, i, j, definedd; char line[256], dev_name[128], *c1, *c2, ctmp; - const char *string; + char *string; FILE *proc_fp; char *end; struct @@ -2818,7 +2818,7 @@ sanei_proc_scsi_find_devices (const char *findvendor, const char *findmodel, while (!feof (proc_fp)) { fgets (line, sizeof (line), proc_fp); - string = sanei_config_skip_whitespace (line); + string = (char *) sanei_config_skip_whitespace (line); while (*string) { @@ -2839,7 +2839,7 @@ sanei_proc_scsi_find_devices (const char *findvendor, const char *findmodel, } ctmp = *c2; *c2 = 0; - string = sanei_config_skip_whitespace (string); + string = (char *) sanei_config_skip_whitespace (string); if (param[i].is_int) { -- cgit v1.2.3