summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/stddef.h5
-rw-r--r--include/stdlib.h5
2 files changed, 8 insertions, 2 deletions
diff --git a/include/stddef.h b/include/stddef.h
index 0fcca4fb5a6..c9eaaa21ecf 100644
--- a/include/stddef.h
+++ b/include/stddef.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: stddef.h,v 1.3 1999/06/11 22:47:48 espie Exp $ */
+/* $OpenBSD: stddef.h,v 1.4 1999/11/27 13:20:25 espie Exp $ */
/* $NetBSD: stddef.h,v 1.4 1994/10/26 00:56:26 cgd Exp $ */
/*-
@@ -49,9 +49,12 @@ typedef _BSD_SIZE_T_ size_t;
#endif
#ifdef _BSD_WCHAR_T_
+/* in C++, wchar_t is a built-in type */
+#ifndef __cplusplus
typedef _BSD_WCHAR_T_ wchar_t;
#undef _BSD_WCHAR_T_
#endif
+#endif
#ifndef NULL
#ifdef __GNUG__
diff --git a/include/stdlib.h b/include/stdlib.h
index 286ebd48b48..afd027aa611 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: stdlib.h,v 1.10 1999/06/11 22:47:48 espie Exp $ */
+/* $OpenBSD: stdlib.h,v 1.11 1999/11/27 13:20:25 espie Exp $ */
/* $NetBSD: stdlib.h,v 1.25 1995/12/27 21:19:08 jtc Exp $ */
/*-
@@ -50,7 +50,10 @@ typedef _BSD_SIZE_T_ size_t;
#endif
#ifdef _BSD_WCHAR_T_
+/* in C++, wchar_t is a built-in type */
+#ifndef __cplusplus
typedef _BSD_WCHAR_T_ wchar_t;
+#endif
#undef _BSD_WCHAR_T_
#endif