Take II at unbreaking world
authorJohn Marino <draco@marino.st>
Tue, 1 Sep 2015 18:24:04 +0000 (20:24 +0200)
committerJohn Marino <draco@marino.st>
Tue, 1 Sep 2015 18:42:22 +0000 (20:42 +0200)
include/ctype.h
include/wctype.h
include/xlocale/_ctype.h

index 965459f..590a406 100644 (file)
@@ -224,7 +224,7 @@ int isspecial(int);
 __END_DECLS
 
 #ifndef __cplusplus
-#define        isalnum(c)      __sbistype((c), _CTYPE_A|_CTYPE_N)
+#define        isalnum(c)      __sbistype((c), _CTYPE_A|_CTYPE_D|_CTYPE_N)
 #define        isalpha(c)      __sbistype((c), _CTYPE_A)
 #define        iscntrl(c)      __sbistype((c), _CTYPE_C)
 #define        isdigit(c)      __sbistype((c), _CTYPE_D)
@@ -265,7 +265,7 @@ __END_DECLS
 #define        digittoint(c)   __sbmaskrune((c), 0xFF)
 #define        ishexnumber(c)  __sbistype((c), _CTYPE_X)
 #define        isideogram(c)   __sbistype((c), _CTYPE_I)
-#define        isnumber(c)     __sbistype((c), _CTYPE_N)
+#define        isnumber(c)     __sbistype((c), _CTYPE_D|_CTYPE_N)
 #define        isphonogram(c)  __sbistype((c), _CTYPE_Q)
 #define        isrune(c)       __sbistype((c), 0xFFFFFF00L)
 #define        isspecial(c)    __sbistype((c), _CTYPE_T)
index 6e87bcb..4f70be5 100644 (file)
@@ -95,7 +95,7 @@ wint_t        nextwctype(wint_t, wctype_t);
 __END_DECLS
 
 #ifndef __cplusplus
-#define        iswalnum(wc)            __istype((wc), _CTYPE_A|_CTYPE_N)
+#define        iswalnum(wc)            __istype((wc), _CTYPE_A|_CTYPE_D|_CTYPE_N)
 #define        iswalpha(wc)            __istype((wc), _CTYPE_A)
 #define        iswblank(wc)            __istype((wc), _CTYPE_B)
 #define        iswcntrl(wc)            __istype((wc), _CTYPE_C)
@@ -115,7 +115,7 @@ __END_DECLS
 #define        iswascii(wc)            (((wc) & ~0x7F) == 0)
 #define        iswhexnumber(wc)        __istype((wc), _CTYPE_X) /* alias of iswxdigit */
 #define        iswideogram(wc)         __istype((wc), _CTYPE_I)
-#define        iswnumber(wc)           __istype((wc), _CTYPE_N)
+#define        iswnumber(wc)           __istype((wc), _CTYPE_D|_CTYPE_N)
 #define        iswphonogram(wc)        __istype((wc), _CTYPE_Q)
 #define        iswrune(wc)             __istype((wc), 0xFFFFFF00L)
 #define        iswspecial(wc)          __istype((wc), _CTYPE_T)
index 8970ece..5d7003e 100644 (file)
@@ -119,7 +119,7 @@ __sbistype_l(__ct_rune_t __c, unsigned long __f, locale_t __loc)
                { return __sbistype_l(__c, __cat, __l); }
 #endif
 
-XLOCALE_ISCTYPE(alnum, _CTYPE_A|_CTYPE_N)
+XLOCALE_ISCTYPE(alnum, _CTYPE_A|_CTYPE_D|_CTYPE_N)
 XLOCALE_ISCTYPE(alpha, _CTYPE_A)
 XLOCALE_ISCTYPE(blank, _CTYPE_B)
 XLOCALE_ISCTYPE(cntrl, _CTYPE_C)
@@ -128,7 +128,7 @@ XLOCALE_ISCTYPE(graph, _CTYPE_G)
 XLOCALE_ISCTYPE(hexnumber, _CTYPE_X)
 XLOCALE_ISCTYPE(ideogram, _CTYPE_I)
 XLOCALE_ISCTYPE(lower, _CTYPE_L)
-XLOCALE_ISCTYPE(number, _CTYPE_N)
+XLOCALE_ISCTYPE(number, _CTYPE_D|_CTYPE_N)
 XLOCALE_ISCTYPE(phonogram, _CTYPE_Q)
 XLOCALE_ISCTYPE(print, _CTYPE_R)
 XLOCALE_ISCTYPE(punct, _CTYPE_P)