[src/trunk]: src/include Don't define wchar_t for c++; it is native in the la...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ef013049e0b6
branches:  trunk
changeset: 749069:ef013049e0b6
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Nov 15 22:21:03 2009 +0000

description:
Don't define wchar_t for c++; it is native in the language. From Alexander
Nasonov

diffstat:

 include/inttypes.h |  4 ++--
 include/stddef.h   |  4 ++--
 include/stdlib.h   |  4 ++--
 include/wchar.h    |  4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diffs (72 lines):

diff -r 7bb83fb19be2 -r ef013049e0b6 include/inttypes.h
--- a/include/inttypes.h        Sun Nov 15 22:17:03 2009 +0000
+++ b/include/inttypes.h        Sun Nov 15 22:21:03 2009 +0000
@@ -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
diff -r 7bb83fb19be2 -r ef013049e0b6 include/stddef.h
--- a/include/stddef.h  Sun Nov 15 22:17:03 2009 +0000
+++ b/include/stddef.h  Sun Nov 15 22:21:03 2009 +0000
@@ -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
diff -r 7bb83fb19be2 -r ef013049e0b6 include/stdlib.h
--- a/include/stdlib.h  Sun Nov 15 22:17:03 2009 +0000
+++ b/include/stdlib.h  Sun Nov 15 22:21:03 2009 +0000
@@ -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
diff -r 7bb83fb19be2 -r ef013049e0b6 include/wchar.h
--- a/include/wchar.h   Sun Nov 15 22:17:03 2009 +0000
+++ b/include/wchar.h   Sun Nov 15 22:21:03 2009 +0000
@@ -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