From 22e24cfdc1d3321c43b7e2a4145dc5a7e7c3152b Mon Sep 17 00:00:00 2001 From: David Chisnall Date: Sat, 12 Nov 2011 20:45:10 +0000 Subject: [PATCH] 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) --- include/wctype.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/wctype.h b/include/wctype.h index 098045fa11a5..183a2cd76534 100644 --- a/include/wctype.h +++ b/include/wctype.h @@ -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_ */