From abbd8902334e8c6409384593b4a2c81f939b47b4 Mon Sep 17 00:00:00 2001
From: Mike Barcroft <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/wchar.h | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'include/wchar.h')

diff --git a/include/wchar.h b/include/wchar.h
index 36785ca09458..bcbac9bb9baf 100644
--- a/include/wchar.h
+++ b/include/wchar.h
@@ -68,7 +68,7 @@
 #define _WCHAR_H_
 
 #include <sys/cdefs.h>
-#include <machine/ansi.h>
+#include <sys/_types.h>
 
 #include <stdio.h>
 
@@ -76,20 +76,20 @@
 #define NULL	0
 #endif
 
-#ifdef	_BSD_MBSTATE_T_
-typedef	_BSD_MBSTATE_T_	mbstate_t;
-#undef	_BSD_MBSTATE_T_
+#ifndef _MBSTATE_T_DECLARED
+typedef	__mbstate_t	mbstate_t;
+#define	_MBSTATE_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
 
@@ -98,9 +98,9 @@ typedef	unsigned long	wctype_t;
 #define	_WCTYPE_T
 #endif
 
-#ifdef	_BSD_WINT_T_
-typedef	_BSD_WINT_T_	wint_t;
-#undef	_BSD_WINT_T_
+#ifndef _WINT_T_DECLARED
+typedef	__wint_t	wint_t;
+#define	_WINT_T_DECLARED
 #endif
 
 #ifndef WEOF
-- 
cgit v1.3