diff options
| author | Dirk Froemberg <dirk@FreeBSD.org> | 2000-08-19 21:26:05 +0000 |
|---|---|---|
| committer | Dirk Froemberg <dirk@FreeBSD.org> | 2000-08-19 21:26:05 +0000 |
| commit | fa627dd9574390f3c2092417728097e8a49441df (patch) | |
| tree | a8403eeb9de4601e204769d4cb1fd3728f21337c /sysutils/cdrtools/files/patch-af | |
| parent | b2e81c917af4a009bf8c88dcc9b7968bdc95f76e (diff) | |
Replace every occurance of scsi_mode_page_header with
scg_scsi_mode_page_header in order to resolve a conflict with
scsi_mode_page_header defined /usr/include/scsi/scsi_all.h.
Diffstat (limited to 'sysutils/cdrtools/files/patch-af')
| -rw-r--r-- | sysutils/cdrtools/files/patch-af | 89 |
1 files changed, 89 insertions, 0 deletions
diff --git a/sysutils/cdrtools/files/patch-af b/sysutils/cdrtools/files/patch-af new file mode 100644 index 000000000000..3e6ff143cf50 --- /dev/null +++ b/sysutils/cdrtools/files/patch-af @@ -0,0 +1,89 @@ +--- cdrecord/drv_sony.c.orig Sun Jul 2 23:11:58 2000 ++++ cdrecord/drv_sony.c Fri Aug 18 22:40:38 2000 +@@ -399,12 +399,12 @@ + msf_t msf; + + char mode[256]; +- struct scsi_mode_page_header *mp; ++ struct scg_scsi_mode_page_header *mp; + struct sony_924_mode_page_22 *xp; + + dummy = get_page22_sony(scgp, mode); + if (dummy >= 0) { +- mp = (struct scsi_mode_page_header *) ++ mp = (struct scg_scsi_mode_page_header *) + (mode + sizeof(struct scsi_mode_header) + + ((struct scsi_mode_header *)mode)->blockdesc_len); + +@@ -572,7 +572,7 @@ + int sectype; + int tracktype; + { +- struct scsi_mode_page_header *mp; ++ struct scg_scsi_mode_page_header *mp; + char mode[256]; + int len = 0x30; + int page = 0x23; +@@ -590,7 +590,7 @@ + if (len == 0) + return (-1); + +- mp = (struct scsi_mode_page_header *) ++ mp = (struct scg_scsi_mode_page_header *) + (mode + sizeof(struct scsi_mode_header) + + ((struct scsi_mode_header *)mode)->blockdesc_len); + +@@ -613,7 +613,7 @@ + int sectype; + int tracktype; + { +- struct scsi_mode_page_header *mp; ++ struct scg_scsi_mode_page_header *mp; + char mode[256]; + int len = 0x30; + int page = 0x23; +@@ -635,7 +635,7 @@ + if (len == 0) + return (-1); + +- mp = (struct scsi_mode_page_header *) ++ mp = (struct scg_scsi_mode_page_header *) + (mode + sizeof(struct scsi_mode_header) + + ((struct scsi_mode_header *)mode)->blockdesc_len); + +@@ -707,7 +707,7 @@ + int toctype; + int multi; + { +- struct scsi_mode_page_header *mp; ++ struct scg_scsi_mode_page_header *mp; + char mode[256]; + int i; + int len = 0x30; +@@ -718,7 +718,7 @@ + if ((len = get_page22_sony(scgp, mode)) < 0) + return (-1); + +- mp = (struct scsi_mode_page_header *) ++ mp = (struct scg_scsi_mode_page_header *) + (mode + sizeof(struct scsi_mode_header) + + ((struct scsi_mode_header *)mode)->blockdesc_len); + +@@ -747,7 +747,7 @@ + SCSI *scgp; + char *mode; + { +- struct scsi_mode_page_header *mp; ++ struct scg_scsi_mode_page_header *mp; + int len = 0x30; + int page = 0x22; + struct sony_924_mode_page_22 *xp; +@@ -764,7 +764,7 @@ + if (len == 0) + return (-1); + +- mp = (struct scsi_mode_page_header *) ++ mp = (struct scg_scsi_mode_page_header *) + (mode + sizeof(struct scsi_mode_header) + + ((struct scsi_mode_header *)mode)->blockdesc_len); + |