Date: Sun, 13 Nov 2011 17:07:26 +0000 (UTC) From: David Chisnall <theraven@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r227490 - head/include Message-ID: <201111131707.pADH7QnD001472@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201111131707.pADH7QnD001472>