aboutsummaryrefslogtreecommitdiff
path: root/include/wchar.h
diff options
context:
space:
mode:
authorTim J. Robbins <tjr@FreeBSD.org>2002-08-06 05:19:33 +0000
committerTim J. Robbins <tjr@FreeBSD.org>2002-08-06 05:19:33 +0000
commit9a1a7924885ebc6f0a670ed9e15a10c950977ddd (patch)
tree30af77648cc04bf59a0be866cdb4516cfaa09d55 /include/wchar.h
parent71a63bac1bd83a656bcfd882a0b7b6f11925a45a (diff)
Notes
Diffstat (limited to 'include/wchar.h')
-rw-r--r--include/wchar.h26
1 files changed, 13 insertions, 13 deletions
diff --git a/include/wchar.h b/include/wchar.h
index b4f19c7284cf..963d923e5876 100644
--- a/include/wchar.h
+++ b/include/wchar.h
@@ -73,6 +73,16 @@
#define NULL 0
#endif
+#ifdef _BSD_MBSTATE_T_
+typedef _BSD_MBSTATE_T_ mbstate_t;
+#undef _BSD_MBSTATE_T_
+#endif
+
+#ifdef _BSD_SIZE_T_
+typedef _BSD_SIZE_T_ size_t;
+#undef _BSD_SIZE_T_
+#endif
+
#ifndef __cplusplus
#ifdef _BSD_WCHAR_T_
typedef _BSD_WCHAR_T_ wchar_t;
@@ -80,9 +90,9 @@ typedef _BSD_WCHAR_T_ wchar_t;
#endif
#endif
-#ifdef _BSD_MBSTATE_T_
-typedef _BSD_MBSTATE_T_ mbstate_t;
-#undef _BSD_MBSTATE_T_
+#ifndef _WCTYPE_T
+typedef unsigned long wctype_t;
+#define _WCTYPE_T
#endif
#ifdef _BSD_WINT_T_
@@ -90,16 +100,6 @@ typedef _BSD_WINT_T_ wint_t;
#undef _BSD_WINT_T_
#endif
-#ifdef _BSD_SIZE_T_
-typedef _BSD_SIZE_T_ size_t;
-#undef _BSD_SIZE_T_
-#endif
-
-#ifndef _WCTYPE_T
-typedef unsigned long wctype_t;
-#define _WCTYPE_T
-#endif
-
#ifndef WEOF
#define WEOF ((wint_t)-1)
#endif