From owner-svn-src-head@FreeBSD.ORG  Sat Nov 12 20:45:11 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5C8FA106566B;
	Sat, 12 Nov 2011 20:45:11 +0000 (UTC)
	(envelope-from theraven@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4CB5A8FC0C;
	Sat, 12 Nov 2011 20:45:11 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pACKjBrL060686;
	Sat, 12 Nov 2011 20:45:11 GMT
	(envelope-from theraven@svn.freebsd.org)
Received: (from theraven@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pACKjBdP060684;
	Sat, 12 Nov 2011 20:45:11 GMT
	(envelope-from theraven@svn.freebsd.org)
Message-Id: <201111122045.pACKjBdP060684@svn.freebsd.org>
From: David Chisnall <theraven@FreeBSD.org>
Date: Sat, 12 Nov 2011 20:45:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r227476 - head/include
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 12 Nov 2011 20:45:11 -0000

Author: theraven
Date: Sat Nov 12 20:45:10 2011
New Revision: 227476
URL: http://svn.freebsd.org/changeset/base/227476

Log:
  Don't expose the wctype.h macros in C++ mode.  They cause problems when
  people try to invoke the namespaced versions of the functions of the
  same names.
  
  Approved by:	dim (mentor)

Modified:
  head/include/wctype.h

Modified: head/include/wctype.h
==============================================================================
--- head/include/wctype.h	Sat Nov 12 20:25:11 2011	(r227475)
+++ head/include/wctype.h	Sat Nov 12 20:45:10 2011	(r227476)
@@ -89,6 +89,7 @@ wint_t	nextwctype(wint_t, wctype_t);
 #endif
 __END_DECLS
 
+#ifndef __cplusplus
 #define	iswalnum(wc)		__istype((wc), _CTYPE_A|_CTYPE_D)
 #define	iswalpha(wc)		__istype((wc), _CTYPE_A)
 #define	iswblank(wc)		__istype((wc), _CTYPE_B)
@@ -113,6 +114,7 @@ __END_DECLS
 #define	iswphonogram(wc)	__istype((wc), _CTYPE_Q)
 #define	iswrune(wc)		__istype((wc), 0xFFFFFF00L)
 #define	iswspecial(wc)		__istype((wc), _CTYPE_T)
-#endif
+#endif /* __BSD_VISIBLE */
+#endif /* __cplusplus */
 
 #endif		/* _WCTYPE_H_ */