X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=include%2Fwctype.h;h=bc2420d3fd84756c11bc575b41224266baf18925;hb=36b72cd6fdfed2cac6b6ff1ed58a96d8265785cf;hp=f7be2cb03849f735b4bcbac5ae4e050da3b96e7f;hpb=c09b6f8ab6edefba52183f8c5ecf6520a8b7ad8f;p=musl

diff --git a/include/wctype.h b/include/wctype.h
index f7be2cb0..bc2420d3 100644
--- a/include/wctype.h
+++ b/include/wctype.h
@@ -5,19 +5,22 @@
 extern "C" {
 #endif
 
+#include <features.h>
+
 #define __NEED_wint_t
-#define __NEED_wctrans_t
 #define __NEED_wctype_t
 
 #if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
- || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE)
+ || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
 #define __NEED_locale_t
 #endif
 
 #include <bits/alltypes.h>
 
+typedef const int * wctrans_t;
+
 #undef WEOF
-#define WEOF (-1)
+#define WEOF 0xffffffffU
 
 #undef iswdigit
 
@@ -40,11 +43,13 @@ wint_t    towupper(wint_t);
 wctrans_t wctrans(const char *);
 wctype_t  wctype(const char *);
 
+#ifndef __cplusplus
 #undef iswdigit
-#define iswdigit(a) (((unsigned)(a)-L'0') < 10)
+#define iswdigit(a) (0 ? iswdigit(a) : ((unsigned)(a)-'0') < 10)
+#endif
 
 #if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
- || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE)
+ || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
 
 int iswalnum_l(wint_t, locale_t);
 int iswalpha_l(wint_t, locale_t);