Use `long' instead of `int' in structure layouts which may get assigned from

(or to) register_t, but need to be usable without register_t in scope, so that
the compiler won't warn about these assignments after the recent _types.h
changes; aoyama@

2 files changed, 50 insertions, 50 deletions

diff --git a/sys/arch/m88k/include/pcb.h b/sys/arch/m88k/include/pcb.h
index f67c12022a5..849e5113710 100644
--- a/sys/arch/m88k/include/pcb.h
+++ b/sys/arch/m88k/include/pcb.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcb.h,v 1.5 2007/11/17 05:36:23 miod Exp $ */
+/*	$OpenBSD: pcb.h,v 1.6 2013/07/17 19:19:29 miod Exp $ */
 /*
  * Copyright (c) 1996 Nivas Madhur
  * Mach Operating System
@@ -48,29 +48,29 @@
  */
 
 struct m88100_pcb {
-	unsigned int pcb_pc;	/* address to return */
-	unsigned int :32;
-	unsigned int pcb_r14;
-	unsigned int pcb_r15;
-	unsigned int pcb_r16;
-	unsigned int pcb_r17;
-	unsigned int pcb_r18;
-	unsigned int pcb_r19;
-	unsigned int pcb_r20;
-	unsigned int pcb_r21;
-	unsigned int pcb_r22;
-	unsigned int pcb_r23;
-	unsigned int pcb_r24;
-	unsigned int pcb_r25;
-	unsigned int pcb_r26;
-	unsigned int pcb_r27;
-	unsigned int pcb_r28;
-	unsigned int pcb_r29;
-	unsigned int pcb_r30;
-	unsigned int pcb_sp; 	/* kernel stack pointer */
+	unsigned long pcb_pc;	/* address to return */
+	unsigned long :32;
+	unsigned long pcb_r14;
+	unsigned long pcb_r15;
+	unsigned long pcb_r16;
+	unsigned long pcb_r17;
+	unsigned long pcb_r18;
+	unsigned long pcb_r19;
+	unsigned long pcb_r20;
+	unsigned long pcb_r21;
+	unsigned long pcb_r22;
+	unsigned long pcb_r23;
+	unsigned long pcb_r24;
+	unsigned long pcb_r25;
+	unsigned long pcb_r26;
+	unsigned long pcb_r27;
+	unsigned long pcb_r28;
+	unsigned long pcb_r29;
+	unsigned long pcb_r30;
+	unsigned long pcb_sp; 	/* kernel stack pointer */
 	/* floating-point state */
-	unsigned int pcb_fcr62;
-	unsigned int pcb_fcr63;
+	unsigned long pcb_fcr62;
+	unsigned long pcb_fcr63;
 };
 
 struct pcb
diff --git a/sys/arch/m88k/include/reg.h b/sys/arch/m88k/include/reg.h
index c1c16474662..8416c6a6b1a 100644
--- a/sys/arch/m88k/include/reg.h
+++ b/sys/arch/m88k/include/reg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: reg.h,v 1.2 2005/05/16 11:47:14 miod Exp $ */
+/*	$OpenBSD: reg.h,v 1.3 2013/07/17 19:19:30 miod Exp $ */
 /*
  * Copyright (c) 1999 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -35,44 +35,44 @@
 #define _M88K_REG_H_
 
 struct reg {
-	unsigned int	r[32];
-	unsigned int	epsr;
-	unsigned int	fpsr;
-	unsigned int	fpcr;
-	unsigned int	sxip;
+	unsigned long	r[32];
+	unsigned long	epsr;
+	unsigned long	fpsr;
+	unsigned long	fpcr;
+	unsigned long	sxip;
 #define exip sxip	/* mc88110 */
-	unsigned int	snip;
+	unsigned long	snip;
 #define enip snip	/* mc88110 */
-	unsigned int	sfip;
-	unsigned int	ssbr;
+	unsigned long	sfip;
+	unsigned long	ssbr;
 #define duap ssbr	/* mc88110 */
-	unsigned int	dmt0;
+	unsigned long	dmt0;
 #define dsr dmt0	/* mc88110 */
-	unsigned int	dmd0;
+	unsigned long	dmd0;
 #define dlar dmd0	/* mc88110 */
-	unsigned int	dma0;
+	unsigned long	dma0;
 #define dpar dma0	/* mc88110 */
-	unsigned int	dmt1;
+	unsigned long	dmt1;
 #define isr dmt1	/* mc88110 */
-	unsigned int	dmd1;
+	unsigned long	dmd1;
 #define ilar dmd1	/* mc88110 */
-	unsigned int	dma1;
+	unsigned long	dma1;
 #define ipar dma1	/* mc88110 */
-	unsigned int	dmt2;
+	unsigned long	dmt2;
 #define isap dmt2	/* mc88110 */
-	unsigned int	dmd2;
+	unsigned long	dmd2;
 #define dsap dmd2	/* mc88110 */
-	unsigned int	dma2;
+	unsigned long	dma2;
 #define iuap dma2	/* mc88110 */
-	unsigned int	fpecr;
-	unsigned int	fphs1;
-	unsigned int	fpls1;
-	unsigned int	fphs2;
-	unsigned int	fpls2;
-	unsigned int	fppt;
-	unsigned int	fprh;
-	unsigned int	fprl;
-	unsigned int	fpit;
+	unsigned long	fpecr;
+	unsigned long	fphs1;
+	unsigned long	fpls1;
+	unsigned long	fphs2;
+	unsigned long	fpls2;
+	unsigned long	fppt;
+	unsigned long	fprh;
+	unsigned long	fprl;
+	unsigned long	fpit;
 };
 
 #endif /* _M88K_REG_H_ */