kill #pragma pack.

1 files changed, 8 insertions, 16 deletions

diff --git a/sys/dev/isa/mcdreg.h b/sys/dev/isa/mcdreg.h
index 198a6c22a53..2afbe520e9f 100644
--- a/sys/dev/isa/mcdreg.h
+++ b/sys/dev/isa/mcdreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mcdreg.h,v 1.3 1998/04/26 21:02:50 provos Exp $	*/
+/*	$OpenBSD: mcdreg.h,v 1.4 1999/01/23 01:13:12 espie Exp $	*/
 /*	$NetBSD: mcdreg.h,v 1.8 1997/04/04 18:59:37 christos Exp $	*/
 
 /*
@@ -44,10 +44,6 @@
  * so this file (and the driver) will then have a better quality.
  */
 
-#if __GNUC__ >= 2
-#pragma pack(1)
-#endif
-
 typedef unsigned char	bcd_t;
 #define	M_msf(msf)	msf[0]
 #define	S_msf(msf)	msf[1]
@@ -167,14 +163,14 @@ union mcd_qchninfo {
 		u_char	upccode[7];
 		u_char	junk[2];
 	} upc;
-};
+} __attribute__((packed));
 
 struct mcd_volinfo {
 	bcd_t	trk_low;
 	bcd_t	trk_high;
 	bcd_t	vol_msf[3];
 	bcd_t	trk1_msf[3];
-};
+} __attribute__((packed));
 
 struct mcd_result {
 	u_char	length;
@@ -189,7 +185,7 @@ struct mcd_result {
 		union mcd_qchninfo qchninfo;
 		struct mcd_volinfo volinfo;
 	} data;
-};
+} __attribute__((packed));
 
 struct mcd_command {
 	u_char	opcode;
@@ -227,19 +223,19 @@ struct mcd_command {
 			u_char	data1, data2;
 		} config;
 	} data;
-};
+} __attribute__((packed));
 
 struct mcd_mbox {
 	struct mcd_command cmd;
 	struct mcd_result res;
-};
+} __attribute__((packed));
 
 struct mcd_volume {
 	u_char	v0l;
 	u_char	v0rs;
 	u_char	v0r;
 	u_char	v0ls;
-};
+} __attribute__((packed));
 
 struct mcd_rawsector {
 	u_char	sync1[12];
@@ -248,8 +244,4 @@ struct mcd_rawsector {
 	u_char	subheader2[4];
 	u_char	data[MCD_BLKSIZE_COOKED];
 	u_char	ecc_bits[280];
-};
-
-#if __GNUC__ >= 2
-#pragma pack(4)
-#endif
+} __attribute__((packed));