From 8d57f68af72eaa99b724e85fc3d3a77ca61fb1c8 Mon Sep 17 00:00:00 2001 From: espie <> Date: Wed, 18 May 2005 13:48:49 +0000 Subject: [PATCH] wchar_t is a native C++ type, gcc picks its definition from elsewhere, so do not redefine it. Found out by the quite picky fixinc in recent gcc. okay millert@, kettenis@ --- src/include/wchar.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/include/wchar.h b/src/include/wchar.h index c7bd964d..c53679f8 100644 --- a/src/include/wchar.h +++ b/src/include/wchar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: wchar.h,v 1.2 2005/05/11 18:44:12 espie Exp $ */ +/* $OpenBSD: wchar.h,v 1.3 2005/05/18 13:48:49 espie Exp $ */ /* $NetBSD: wchar.h,v 1.16 2003/03/07 07:11:35 tshiozak Exp $ */ /*- @@ -80,7 +80,9 @@ #include /* for FILE* */ #ifdef _BSD_WCHAR_T_ +# ifndef __cplusplus typedef _BSD_WCHAR_T_ wchar_t; +# endif #undef _BSD_WCHAR_T_ #endif