From fd04d24d6b689b070a643fa7b0e511322356dfaa Mon Sep 17 00:00:00 2001
From: "Andrey A. Chernov" <ache@FreeBSD.org>
Date: Fri, 2 Feb 1996 20:41:11 +0000
Subject: [PATCH] Remove #pragma pack, use byte filler in ioc_read_subchannel
 instead, all other structures already aligned

---
 sys/sys/cdio.h | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/sys/sys/cdio.h b/sys/sys/cdio.h
index 9c915f81968c..73da015cc775 100644
--- a/sys/sys/cdio.h
+++ b/sys/sys/cdio.h
@@ -1,7 +1,7 @@
 /*
  * 16 Feb 93	Julian Elischer	(julian@dialix.oz.au)
  *
- *	$Id: cdio.h,v 1.10 1996/02/01 16:16:11 ache Exp $
+ *	$Id: cdio.h,v 1.11 1996/02/01 18:18:54 ache Exp $
  */
 /*
 <1>	Fixed a conflict with ioctl usage.  There were two different
@@ -25,12 +25,6 @@
 #ifndef _SYS_CDIO_H_
 #define _SYS_CDIO_H_
 
-#ifdef __GNUC__
-#if __GNUC__ >= 2
-#pragma pack(1)
-#endif
-#endif
-
 union msf_lba {
 	struct {
 		unsigned char   unused;
@@ -135,6 +129,7 @@ struct ioc_read_subchannel {
 #define CD_MEDIA_CATALOG	2
 #define CD_TRACK_INFO		3
 	u_char track;
+        u_char  :8;
 	int	data_len;
 	struct  cd_sub_channel_info *data;
 };
@@ -265,11 +260,5 @@ struct ioc_capability {			/*<2>*/
 
 #define	CDIOCCAPABILITY	_IOR('c',30,struct ioc_capability)	/*<2>*/
 
-#ifdef __GNUC__
-#if __GNUC__ >= 2
-#pragma pack(4)
-#endif
-#endif
-
 #endif /* _SYS_CDIO_H_ */