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.

4 files changed, 167 insertions, 0 deletions

diff --git a/sysutils/cdrecord/files/patch-ae b/sysutils/cdrecord/files/patch-ae
new file mode 100644
index 000000000000..03f40b8e9ec0
--- /dev/null
+++ b/sysutils/cdrecord/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);
+ 
diff --git a/sysutils/cdrecord/files/patch-af b/sysutils/cdrecord/files/patch-af
new file mode 100644
index 000000000000..3e6ff143cf50
--- /dev/null
+++ b/sysutils/cdrecord/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);
+ 
diff --git a/sysutils/cdrecord/files/patch-ag b/sysutils/cdrecord/files/patch-ag
new file mode 100644
index 000000000000..e1b0f3b748e2
--- /dev/null
+++ b/sysutils/cdrecord/files/patch-ag
@@ -0,0 +1,20 @@
+--- cdrecord/modes.c.orig	Sun May  7 14:49:37 2000
++++ cdrecord/modes.c	Fri Aug 18 22:40:38 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');
+@@ -89,7 +89,7 @@
+ 		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);
++	mp = (struct scg_scsi_mode_page_header *)(mode + hdlen);
+ 	if (scgp->verbose)
+ 		scsiprbytes("Mode Page  Data", (u_char *)mp, mp->p_len+2);
+ 
diff --git a/sysutils/cdrecord/files/patch-ah b/sysutils/cdrecord/files/patch-ah
new file mode 100644
index 000000000000..d9bc5cd64fc0
--- /dev/null
+++ b/sysutils/cdrecord/files/patch-ah
@@ -0,0 +1,20 @@
+--- libscg/scg/scsireg.h.orig	Sun May 28 23:31:20 2000
++++ libscg/scg/scsireg.h	Fri Aug 18 22:40:38 2000
+@@ -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;