svn commit: r227476 - head/include

[David Chisnall]

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_ */