From 7dbb860b71d5e74ddb0d45595db60de4bc241b0f Mon Sep 17 00:00:00 2001
From: bde <bde@FreeBSD.org>
Date: Wed, 1 May 1996 00:40:10 +0000
Subject: Fixed longstanding namespace convolution involving rune_t vs wchar_t.
 If _ANSI_SOURCE or _POSIX_SOURCE is defined, then <ctype.h> had to be
 included before <stddef.h> or <stdlib.h> to get rune_t declared. Now rune_t
 is declared perfectly bogusly in all cases when <ctype.h> is included.

This change breaks similar (but more convoluted) convolutions in the
stddef.h in gcc distributions.  Ports of gcc should avoid using the
gcc headers.
---
 include/runetype.h | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'include/runetype.h')

diff --git a/include/runetype.h b/include/runetype.h
index 057cc35..e7fdf5d 100644
--- a/include/runetype.h
+++ b/include/runetype.h
@@ -39,13 +39,12 @@
 #ifndef	_RUNETYPE_H_
 #define	_RUNETYPE_H_
 
-#include <machine/ansi.h>
 #include <sys/cdefs.h>
+#include <machine/ansi.h>
 
-#ifdef  _BSD_WCHAR_T_
-typedef _BSD_WCHAR_T_	rune_t;
-typedef _BSD_WCHAR_T_	wchar_t;
-#undef  _BSD_WCHAR_T_
+#ifdef	_BSD_RUNE_T_
+typedef	_BSD_RUNE_T_	rune_t;
+#undef	_BSD_RUNE_T_
 #endif
 
 #ifdef	_BSD_SIZE_T_
@@ -53,6 +52,11 @@ typedef	_BSD_SIZE_T_	size_t;
 #undef	_BSD_SIZE_T_
 #endif
 
+#ifdef	_BSD_WCHAR_T_
+typedef	_BSD_WCHAR_T_	wchar_t;
+#undef	_BSD_WCHAR_T_
+#endif
+
 #define	_CACHED_RUNES	(1 <<8 )	/* Must be a power of 2 */
 #define	_CRMASK		(~(_CACHED_RUNES - 1))
 
-- 
cgit v1.1