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.

3 files changed, 5 insertions, 9 deletions

diff --git a/lib/libc/locale/runetype.c b/lib/libc/locale/runetype.c
index a9bba8e..282f806 100644
--- a/lib/libc/locale/runetype.c
+++ b/lib/libc/locale/runetype.c
@@ -39,7 +39,7 @@
 
 unsigned long
 ___runetype(c)
-	_BSD_RUNE_T_ c;
+	_BSD_CT_RUNE_T_ c;
 {
 #ifdef XPG4
 	int x;
@@ -62,4 +62,3 @@ ___runetype(c)
 #endif
 	return(0L);
 }
-
diff --git a/lib/libc/locale/tolower.c b/lib/libc/locale/tolower.c
index f8d1623..65d5175 100644
--- a/lib/libc/locale/tolower.c
+++ b/lib/libc/locale/tolower.c
@@ -37,9 +37,9 @@
 #include <stdio.h>
 #include <rune.h>
 
-_BSD_RUNE_T_
+_BSD_CT_RUNE_T_
 ___tolower(c)
-	_BSD_RUNE_T_ c;
+	_BSD_CT_RUNE_T_ c;
 {
 #ifdef XPG4
 	int x;
@@ -58,5 +58,3 @@ ___tolower(c)
 #endif
 	return(c);
 }
-
-
diff --git a/lib/libc/locale/toupper.c b/lib/libc/locale/toupper.c
index 9e60977..d2e4480 100644
--- a/lib/libc/locale/toupper.c
+++ b/lib/libc/locale/toupper.c
@@ -37,9 +37,9 @@
 #include <stdio.h>
 #include <rune.h>
 
-_BSD_RUNE_T_
+_BSD_CT_RUNE_T_
 ___toupper(c)
-	_BSD_RUNE_T_ c;
+	_BSD_CT_RUNE_T_ c;
 {
 #ifdef XPG4
 	int x;
@@ -58,4 +58,3 @@ ___toupper(c)
 #endif
 	return(c);
 }
-