Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/include/wchar.h,v
rcsdiff: /ftp/cvs/cvsroot/src/include/wchar.h,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.27
retrieving revision 1.27.18.1
diff -u -p -r1.27 -r1.27.18.1
--- src/include/wchar.h	2008/04/28 20:22:54	1.27
+++ src/include/wchar.h	2011/05/20 19:18:44	1.27.18.1
@@ -1,4 +1,4 @@
-/*	$NetBSD: wchar.h,v 1.27 2008/04/28 20:22:54 martin Exp $	*/
+/*	$NetBSD: wchar.h,v 1.27.18.1 2011/05/20 19:18:44 bouyer 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