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/mkisofs-devel/files/patch-bd | |
| 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/mkisofs-devel/files/patch-bd')
| -rw-r--r-- | sysutils/mkisofs-devel/files/patch-bd | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/sysutils/mkisofs-devel/files/patch-bd b/sysutils/mkisofs-devel/files/patch-bd new file mode 100644 index 000000000000..12e64251973f --- /dev/null +++ b/sysutils/mkisofs-devel/files/patch-bd @@ -0,0 +1,47 @@ +--- libscg/scg/scsireg.h.orig Sun May 28 23:31:20 2000 ++++ libscg/scg/scsireg.h Thu Aug 17 20:31:45 2000 +@@ -170,7 +170,7 @@ + + #if defined(_BIT_FIELDS_LTOH) /* Intel byteorder */ + +-struct scsi_mode_header { ++struct scg_scsi_mode_header { + Ucbit sense_data_len : 8; + u_char medium_type; + Ucbit res2 : 4; +@@ -182,7 +182,7 @@ + + #else /* Motorola byteorder */ + +-struct scsi_mode_header { ++struct scg_scsi_mode_header { + Ucbit sense_data_len : 8; + u_char medium_type; + Ucbit write_prot : 1; +@@ -244,7 +244,7 @@ + + #if defined(_BIT_FIELDS_LTOH) /* Intel byteorder */ + +-struct scsi_mode_page_header { ++struct scg_scsi_mode_page_header { + Ucbit p_code : 6; + Ucbit res : 1; + Ucbit parsave : 1; +@@ -262,7 +262,7 @@ + + #else /* Motorola byteorder */ + +-struct scsi_mode_page_header { ++struct scg_scsi_mode_page_header { + Ucbit parsave : 1; + Ucbit res : 1; + Ucbit p_code : 6; +@@ -988,7 +988,7 @@ + + + struct scsi_mode_data { +- struct scsi_mode_header header; ++ struct scg_scsi_mode_header header; + struct scsi_mode_blockdesc blockdesc; + union pagex { + struct acb_mode_data acb; |