mirror of
https://github.com/freebsd/freebsd-src.git
synced 2024-12-04 12:28:58 +00:00
Remove #pragma pack, use byte filler in ioc_read_subchannel
instead, all other structures already aligned
This commit is contained in:
parent
b184a4f4e4
commit
fd04d24d6b
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=13859
@ -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_ */
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user