Module Name: src
Committed By: christos
Date: Sun Nov 15 22:21:03 UTC 2009
Modified Files:
src/include: inttypes.h stddef.h stdlib.h wchar.h
Log Message:
Don't define wchar_t for c++; it is native in the language. From Alexander
Nasonov
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/include/inttypes.h
cvs rdiff -u -r1.15 -r1.16 src/include/stddef.h
cvs rdiff -u -r1.89 -r1.90 src/include/stdlib.h
cvs rdiff -u -r1.27 -r1.28 src/include/wchar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/include/inttypes.h
diff -u src/include/inttypes.h:1.6 src/include/inttypes.h:1.7
--- src/include/inttypes.h:1.6 Mon Aug 4 17:19:45 2008
+++ src/include/inttypes.h Sun Nov 15 17:21:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: inttypes.h,v 1.6 2008/08/04 21:19:45 matt Exp $ */
+/* $NetBSD: inttypes.h,v 1.7 2009/11/15 22:21:03 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
#include <sys/inttypes.h>
#include <machine/ansi.h>
-#ifdef _BSD_WCHAR_T_
+#if defined(_BSD_WCHAR_T_) && !defined(__cplusplus)
typedef _BSD_WCHAR_T_ wchar_t;
#undef _BSD_WCHAR_T_
#endif
Index: src/include/stddef.h
diff -u src/include/stddef.h:1.15 src/include/stddef.h:1.16
--- src/include/stddef.h:1.15 Mon Aug 21 12:58:29 2006
+++ src/include/stddef.h Sun Nov 15 17:21:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: stddef.h,v 1.15 2006/08/21 16:58:29 thorpej Exp $ */
+/* $NetBSD: stddef.h,v 1.16 2009/11/15 22:21:03 christos Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -45,7 +45,7 @@
#undef _BSD_SIZE_T_
#endif
-#ifdef _BSD_WCHAR_T_
+#if defined(_BSD_WCHAR_T_) && !defined(__cplusplus)
typedef _BSD_WCHAR_T_ wchar_t;
#undef _BSD_WCHAR_T_
#endif
Index: src/include/stdlib.h
diff -u src/include/stdlib.h:1.89 src/include/stdlib.h:1.90
--- src/include/stdlib.h:1.89 Mon Jul 20 13:03:37 2009
+++ src/include/stdlib.h Sun Nov 15 17:21:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: stdlib.h,v 1.89 2009/07/20 17:03:37 joerg Exp $ */
+/* $NetBSD: stdlib.h,v 1.90 2009/11/15 22:21:03 christos Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -48,7 +48,7 @@
#undef _BSD_SIZE_T_
#endif
-#ifdef _BSD_WCHAR_T_
+#if defined(_BSD_WCHAR_T_) && !defined(__cplusplus)
typedef _BSD_WCHAR_T_ wchar_t;
#undef _BSD_WCHAR_T_
#endif
Index: src/include/wchar.h
diff -u src/include/wchar.h:1.27 src/include/wchar.h:1.28
--- src/include/wchar.h:1.27 Mon Apr 28 16:22:54 2008
+++ src/include/wchar.h Sun Nov 15 17:21:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: wchar.h,v 1.27 2008/04/28 20:22:54 martin Exp $ */
+/* $NetBSD: wchar.h,v 1.28 2009/11/15 22:21:03 christos Exp $ */
/*-
* Copyright (c)1999 Citrus Project,
@@ -66,7 +66,7 @@
#include <stdio.h> /* for FILE* */
-#ifdef _BSD_WCHAR_T_
+#if defined(_BSD_WCHAR_T_) && !defined(__cplusplus)
typedef _BSD_WCHAR_T_ wchar_t;
#undef _BSD_WCHAR_T_
#endif
