Adapt things to use __type_t instead of _BSD_TYPE_T_

Add new sys/_types.h header
Include machine/_types.h or sys/_types.h where applicable

5 files changed, 17 insertions, 19 deletions

diff --git a/sys/arch/powerpc/include/frame.h b/sys/arch/powerpc/include/frame.h
index 674f7c2e9fa..4eda8735ee7 100644
--- a/sys/arch/powerpc/include/frame.h
+++ b/sys/arch/powerpc/include/frame.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: frame.h,v 1.6 2005/08/02 21:02:49 drahn Exp $	*/
+/*	$OpenBSD: frame.h,v 1.7 2006/01/06 18:53:05 millert Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -33,8 +33,6 @@
 #ifndef	_POWERPC_FRAME_H_
 #define	_POWERPC_FRAME_H_
 
-#include <machine/types.h>
-
 /*
  * This is to ensure alignment of the stackpointer
  */
diff --git a/sys/arch/powerpc/include/signal.h b/sys/arch/powerpc/include/signal.h
index d25ec5e6fe6..89f2bb0dc84 100644
--- a/sys/arch/powerpc/include/signal.h
+++ b/sys/arch/powerpc/include/signal.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: signal.h,v 1.5 2005/12/14 21:46:31 millert Exp $	*/
+/*	$OpenBSD: signal.h,v 1.6 2006/01/06 18:53:05 millert Exp $	*/
 /*	$NetBSD: signal.h,v 1.1 1996/09/30 16:34:34 ws Exp $	*/
 
 /*
@@ -39,7 +39,7 @@
 typedef int sig_atomic_t;
 
 #if __BSD_VISIBLE
-#include <machine/types.h>
+#include <machine/_types.h>
 
 /*
  * We have to save all registers on every trap, because
@@ -51,16 +51,16 @@ typedef int sig_atomic_t;
  *
  */
 struct trapframe {
-	u_int32_t fixreg[32];
-	u_int32_t lr;
-	u_int32_t cr;
-	u_int32_t xer;
-	u_int32_t ctr;
+	__register_t fixreg[32];
+	__register_t lr;
+	__register_t cr;
+	__register_t xer;
+	__register_t ctr;
 	int srr0;
 	int srr1;
 	int dar;			/* dar & dsisr are only filled on a DSI trap */
 	int dsisr;
-	u_int32_t exc;
+	__register_t exc;
 };
 
 struct sigcontext {
diff --git a/sys/arch/powerpc/include/stdarg.h b/sys/arch/powerpc/include/stdarg.h
index 9c23da50f7e..76e3cda1d08 100644
--- a/sys/arch/powerpc/include/stdarg.h
+++ b/sys/arch/powerpc/include/stdarg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stdarg.h,v 1.5 2003/06/02 23:27:53 millert Exp $	*/
+/*	$OpenBSD: stdarg.h,v 1.6 2006/01/06 18:53:05 millert Exp $	*/
 /*	$NetBSD: stdarg.h,v 1.1 1996/09/30 16:34:35 ws Exp $	*/
 
 /*-
@@ -35,13 +35,13 @@
 #ifndef _POWERPC_STDARG_H_
 #define	_POWERPC_STDARG_H_
 
-#include <machine/ansi.h>
+#include <machine/_types.h>
 
 #ifndef	_STDARG_H
 #define	_STDARG_H
 #endif
 #include <machine/va-ppc.h>
 
-typedef _BSD_VA_LIST_	va_list;
+typedef __va_list	va_list;
 
 #endif /* !_POWERPC_STDARG_H_ */
diff --git a/sys/arch/powerpc/include/va-ppc.h b/sys/arch/powerpc/include/va-ppc.h
index 028bae06382..86353c6b2ef 100644
--- a/sys/arch/powerpc/include/va-ppc.h
+++ b/sys/arch/powerpc/include/va-ppc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: va-ppc.h,v 1.11 2005/12/14 21:46:31 millert Exp $	*/
+/*	$OpenBSD: va-ppc.h,v 1.12 2006/01/06 18:53:05 millert Exp $	*/
 /* GNU C varargs support for the PowerPC with either the V.4 or Windows NT calling sequences */
 
 #include <sys/cdefs.h>
@@ -29,7 +29,7 @@ typedef struct __va_list_tag {
   char *overflow_arg_area;	/* location on stack that holds the next
 				   overflow argument */
   char *reg_save_area;		/* where r3:r10 and f1:f8, if saved are stored */
-} __va_list[1], __gnuc_va_list[1];
+} __gnuc_va_list[1];
 
 #else /* _SYS_VA_LIST */
 
diff --git a/sys/arch/powerpc/include/varargs.h b/sys/arch/powerpc/include/varargs.h
index 4330af8f837..e17efff0df7 100644
--- a/sys/arch/powerpc/include/varargs.h
+++ b/sys/arch/powerpc/include/varargs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: varargs.h,v 1.4 2003/06/02 23:27:53 millert Exp $	*/
+/*	$OpenBSD: varargs.h,v 1.5 2006/01/06 18:53:05 millert Exp $	*/
 /*	$NetBSD: varargs.h,v 1.1 1996/09/30 16:34:37 ws Exp $	*/
 
 /*-
@@ -42,9 +42,9 @@
 
 #define _VARARGS_H
 
-#include <machine/ansi.h>
+#include <machine/_types.h>
 #include <machine/va-ppc.h>
 
-typedef _BSD_VA_LIST_ va_list;
+typedef __va_list va_list;
 
 #endif /* !_POWERPC_VARARGS_H_ */