From owner-svn-src-all@FreeBSD.ORG  Sun Nov 13 17:07:27 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2B9FE106564A;
	Sun, 13 Nov 2011 17:07:27 +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 1C1938FC17;
	Sun, 13 Nov 2011 17:07:27 +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 pADH7QPl001474;
	Sun, 13 Nov 2011 17:07:26 GMT
	(envelope-from theraven@svn.freebsd.org)
Received: (from theraven@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pADH7QnD001472;
	Sun, 13 Nov 2011 17:07:26 GMT
	(envelope-from theraven@svn.freebsd.org)
Message-Id: <201111131707.pADH7QnD001472@svn.freebsd.org>
From: David Chisnall <theraven@FreeBSD.org>
Date: Sun, 13 Nov 2011 17:07:26 +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: r227490 - head/include
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 13 Nov 2011 17:07:27 -0000

Author: theraven
Date: Sun Nov 13 17:07:26 2011
New Revision: 227490
URL: http://svn.freebsd.org/changeset/base/227490

Log:
  Hide some more macros that will break C++ when compiling in C++ mode.
  
  Approved by:	dim (mentor)

Modified:
  head/include/ctype.h

Modified: head/include/ctype.h
==============================================================================
--- head/include/ctype.h	Sun Nov 13 17:06:33 2011	(r227489)
+++ head/include/ctype.h	Sun Nov 13 17:07:26 2011	(r227490)
@@ -80,6 +80,7 @@ int	isspecial(int);
 #endif
 __END_DECLS
 
+#ifndef __cplusplus
 #define	isalnum(c)	__sbistype((c), _CTYPE_A|_CTYPE_D)
 #define	isalpha(c)	__sbistype((c), _CTYPE_A)
 #define	iscntrl(c)	__sbistype((c), _CTYPE_C)
@@ -93,6 +94,7 @@ __END_DECLS
 #define	isxdigit(c)	__isctype((c), _CTYPE_X) /* ANSI -- locale independent */
 #define	tolower(c)	__sbtolower(c)
 #define	toupper(c)	__sbtoupper(c)
+#endif /* !__cplusplus */
 
 #if __XSI_VISIBLE
 /*
@@ -112,7 +114,7 @@ __END_DECLS
 #define	toascii(c)	((c) & 0x7F)
 #endif
 
-#if __ISO_C_VISIBLE >= 1999
+#if __ISO_C_VISIBLE >= 1999 && !defined(__cplusplus)
 #define	isblank(c)	__sbistype((c), _CTYPE_B)
 #endif