From 9e6f796b0d2083dcc48c062853660f96db0a3c8d Mon Sep 17 00:00:00 2001
From: mike <mike@FreeBSD.org>
Date: Wed, 21 Aug 2002 16:20:02 +0000
Subject: o Merge <machine/ansi.h> and <machine/types.h> into a new header  
 called <machine/_types.h>. o <machine/ansi.h> will continue to live so it can
 define MD clock   macros, which are only MD because of gratuitous differences
 between   architectures. o Change all headers to make use of this.  This
 mainly involves   changing:     #ifdef _BSD_FOO_T_     typedef	_BSD_FOO_T_
 foo_t;     #undef _BSD_FOO_T_     #endif   to:     #ifndef _FOO_T_DECLARED   
  typedef	__foo_t	foo_t;     #define	_FOO_T_DECLARED     #endif

Concept by:	bde
Reviewed by:	jake, obrien
---
 include/runetype.h | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'include/runetype.h')

diff --git a/include/runetype.h b/include/runetype.h
index 4ddd95d..522206d 100644
--- a/include/runetype.h
+++ b/include/runetype.h
@@ -41,22 +41,22 @@
 #define	_RUNETYPE_H_
 
 #include <sys/cdefs.h>
-#include <machine/ansi.h>
+#include <sys/_types.h>
 
-#ifdef	_BSD_RUNE_T_
-typedef	_BSD_RUNE_T_	rune_t;
-#undef	_BSD_RUNE_T_
+#ifndef _RUNE_T_DECLARED
+typedef	__rune_t	rune_t;
+#define	_RUNE_T_DECLARED
 #endif
 
-#ifdef	_BSD_SIZE_T_
-typedef	_BSD_SIZE_T_	size_t;
-#undef	_BSD_SIZE_T_
+#ifndef _SIZE_T_DECLARED
+typedef	__size_t	size_t;
+#define	_SIZE_T_DECLARED
 #endif
 
 #ifndef	__cplusplus
-#ifdef	_BSD_WCHAR_T_
-typedef	_BSD_WCHAR_T_	wchar_t;
-#undef	_BSD_WCHAR_T_
+#ifndef _WCHAR_T_DECLARED
+typedef	__wchar_t	wchar_t;
+#define	_WCHAR_T_DECLARED
 #endif
 #endif
 
-- 
cgit v1.1