Merge machine/ansi.h and machine/types.h into machine/_types.h and

rename the types using the __ protected namespace (e.g. __size_t).
Idea from FreeBSD.

3 files changed, 12 insertions, 16 deletions

diff --git a/sys/arch/hp300/include/_types.h b/sys/arch/hp300/include/_types.h
new file mode 100644
index 00000000000..1e87b468dea
--- /dev/null
+++ b/sys/arch/hp300/include/_types.h
@@ -0,0 +1,12 @@
+/*	$OpenBSD: _types.h,v 1.1 2006/01/06 18:50:08 millert Exp $	*/
+
+/* public domain */
+
+#ifndef _HP300__TYPES_H_
+#define _HP300__TYPES_H_
+
+#include <m68k/_types.h>
+
+#define __HAVE_DEVICE_REGISTER
+
+#endif /* _HP300__TYPES_H_ */
diff --git a/sys/arch/hp300/include/ansi.h b/sys/arch/hp300/include/ansi.h
deleted file mode 100644
index a17e8bfcaf6..00000000000
--- a/sys/arch/hp300/include/ansi.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/*	$OpenBSD: ansi.h,v 1.2 1997/01/12 15:13:30 downsj Exp $	*/
-/*	$NetBSD: ansi.h,v 1.4 1994/10/26 07:26:16 cgd Exp $	*/
-
-/* Just use the common m68k definition */
-#include <m68k/ansi.h>
diff --git a/sys/arch/hp300/include/types.h b/sys/arch/hp300/include/types.h
deleted file mode 100644
index e5d87f9fa78..00000000000
--- a/sys/arch/hp300/include/types.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/*	$OpenBSD: types.h,v 1.5 2004/11/26 21:23:04 miod Exp $	*/
-/*	$NetBSD: types.h,v 1.8 1996/12/17 08:11:50 thorpej Exp $	*/
-
-#ifndef _MACHINE_TYPES_H_
-#define _MACHINE_TYPES_H_
-
-#include <m68k/types.h>
-
-#define __HAVE_DEVICE_REGISTER
-
-#endif