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.

3 files changed, 122 insertions, 0 deletions

diff --git a/sysutils/mkisofs-devel/files/patch-bc b/sysutils/mkisofs-devel/files/patch-bc
new file mode 100644
index 00000000000..b8e8c1f84a8
--- /dev/null
+++ b/sysutils/mkisofs-devel/files/patch-bc
@@ -0,0 +1,42 @@
+--- mkisofs/modes.c.orig	Sun May  7 14:49:37 2000
++++ mkisofs/modes.c	Thu Aug 17 21:02:57 2000
+@@ -58,7 +58,7 @@
+ 	int	hdlen;
+ 	int	len = 1;				/* Nach SCSI Norm */
+ 	int	try = 0;
+-	struct	scsi_mode_page_header *mp;
++	struct	scg_scsi_mode_page_header *mp;
+ 
+ again:
+ 	fillbytes((caddr_t)mode, sizeof(mode), '\0');
+@@ -77,7 +77,7 @@
+ 		scgp->silent--;
+ 		return (FALSE);
+ 	} else {
+-		len = ((struct scsi_mode_header *)mode)->sense_data_len + 1;
++		len = ((struct scg_scsi_mode_header *)mode)->sense_data_len + 1;
+ 	}
+ 	if (mode_sense(scgp, mode, len, page, 0) < 0) {	/* Page n current */
+ 		scgp->silent--;
+@@ -87,9 +87,9 @@
+ 
+ 	if (scgp->verbose)
+ 		scsiprbytes("Mode Sense Data", mode, len - scsigetresid(scgp));
+-	hdlen = sizeof(struct scsi_mode_header) +
+-			((struct scsi_mode_header *)mode)->blockdesc_len;
+-	mp = (struct scsi_mode_page_header *)(mode + hdlen);
++	hdlen = sizeof(struct scg_scsi_mode_header) +
++			((struct scg_scsi_mode_header *)mode)->blockdesc_len;
++	mp = (struct scg_scsi_mode_page_header *)(mode + hdlen);
+ 	if (scgp->verbose)
+ 		scsiprbytes("Mode Page  Data", (u_char *)mp, mp->p_len+2);
+ 
+@@ -223,7 +223,7 @@
+ 	((struct scsi_modesel_header *)modep)->sense_data_len	= 0;
+ 	((struct scsi_modesel_header *)modep)->res2		= 0;
+ 
+-	i = ((struct scsi_mode_header *)modep)->blockdesc_len;
++	i = ((struct scg_scsi_mode_header *)modep)->blockdesc_len;
+ 	if (i > 0) {
+ 		i_to_3_byte(
+ 			((struct scsi_mode_data *)modep)->blockdesc.nlblock,
diff --git a/sysutils/mkisofs-devel/files/patch-bd b/sysutils/mkisofs-devel/files/patch-bd
new file mode 100644
index 00000000000..12e64251973
--- /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;
diff --git a/sysutils/mkisofs-devel/files/patch-be b/sysutils/mkisofs-devel/files/patch-be
new file mode 100644
index 00000000000..422bb3d976f
--- /dev/null
+++ b/sysutils/mkisofs-devel/files/patch-be
@@ -0,0 +1,33 @@
+--- 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