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-devel/files/patch-ae | |
| 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-devel/files/patch-ae')
| -rw-r--r-- | sysutils/cdrtools-devel/files/patch-ae | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/sysutils/cdrtools-devel/files/patch-ae b/sysutils/cdrtools-devel/files/patch-ae new file mode 100644 index 000000000000..03f40b8e9ec0 --- /dev/null +++ b/sysutils/cdrtools-devel/files/patch-ae @@ -0,0 +1,38 @@ +--- cdrecord/drv_philips.c.orig Sun May 7 14:39:57 2000 ++++ cdrecord/drv_philips.c Fri Aug 18 22:40:38 2000 +@@ -518,7 +518,7 @@ + int *speedp; + int dummy; + { +- struct scsi_mode_page_header *mp; ++ struct scg_scsi_mode_page_header *mp; + char mode[256]; + int len = 16; + int page = 0x31; +@@ -539,7 +539,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); + +@@ -567,7 +567,7 @@ + int *speedp; + int dummy; + { +- struct scsi_mode_page_header *mp; ++ struct scg_scsi_mode_page_header *mp; + char mode[256]; + int len = 20; + int page = 0x23; +@@ -588,7 +588,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); + |