diff options
| author | ache <ache@FreeBSD.org> | 1996-02-02 20:41:11 +0000 |
|---|---|---|
| committer | ache <ache@FreeBSD.org> | 1996-02-02 20:41:11 +0000 |
| commit | de77025d55c9d312751d5b252044ce87f9901ba5 (patch) | |
| tree | df5a7a2ef83f44de63637204eab1ce3615de2a6a /sys/sys/cdio.h | |
| parent | 26db461f3e8cb52d9f97a60c366f3e15d634d2a1 (diff) | |
| download | FreeBSD-src-de77025d55c9d312751d5b252044ce87f9901ba5.zip FreeBSD-src-de77025d55c9d312751d5b252044ce87f9901ba5.tar.gz | |
Remove #pragma pack, use byte filler in ioc_read_subchannel
instead, all other structures already aligned
Diffstat (limited to 'sys/sys/cdio.h')
| -rw-r--r-- | sys/sys/cdio.h | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/sys/sys/cdio.h b/sys/sys/cdio.h index 9c915f8..73da015 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_ */ |
