diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-07-15 11:25:39 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-07-15 11:25:39 +0200 |
| commit | 1edb02101a9306fc711cd422ed507d18165b1691 (patch) | |
| tree | bd2d48a139bfbe869f4f49359b63097931a45e7b /sanei/sanei_scsi.c | |
| parent | 2ca8a81bd0d99fe4d75c229d0e988d8ef710285f (diff) | |
move from support/1.0.27 to feature/1.0.27
Diffstat (limited to 'sanei/sanei_scsi.c')
| -rw-r--r-- | sanei/sanei_scsi.c | 8 |
1 files changed, 4 insertions, 4 deletions
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 <sys/scsi.h> # include <sys/scsicmd.h> @@ -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) { |