mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-05 22:43:24 +00:00
fa627dd957
scg_scsi_mode_page_header in order to resolve a conflict with scsi_mode_page_header defined /usr/include/scsi/scsi_all.h.
34 lines
1.0 KiB
Plaintext
34 lines
1.0 KiB
Plaintext
--- mkisofs/scsi_cdr.c.orig Sun Jul 2 23:11:23 2000
|
|
+++ mkisofs/scsi_cdr.c Thu Aug 17 21:02:04 2000
|
|
@@ -1791,7 +1791,7 @@
|
|
int secsize;
|
|
{
|
|
struct scsi_mode_data md;
|
|
- int count = sizeof(struct scsi_mode_header) +
|
|
+ int count = sizeof(struct scg_scsi_mode_header) +
|
|
sizeof(struct scsi_mode_blockdesc);
|
|
|
|
(void)test_unit_ready(scgp); /* clear any error situation */
|
|
@@ -2462,8 +2462,8 @@
|
|
return (NULL);
|
|
|
|
mp = (struct cd_mode_page_2A *)
|
|
- (mode + sizeof(struct scsi_mode_header) +
|
|
- ((struct scsi_mode_header *)mode)->blockdesc_len);
|
|
+ (mode + sizeof(struct scg_scsi_mode_header) +
|
|
+ ((struct scg_scsi_mode_header *)mode)->blockdesc_len);
|
|
|
|
/*
|
|
* Do some heuristics against pre SCSI-3/mmc VU page 2A
|
|
@@ -2481,8 +2481,8 @@
|
|
if (val != 0 && val < 176)
|
|
return (NULL);
|
|
|
|
- len -= sizeof(struct scsi_mode_header) +
|
|
- ((struct scsi_mode_header *)mode)->blockdesc_len;
|
|
+ len -= sizeof(struct scg_scsi_mode_header) +
|
|
+ ((struct scg_scsi_mode_header *)mode)->blockdesc_len;
|
|
if (modep)
|
|
mp2 = (struct cd_mode_page_2A *)modep;
|
|
else
|