type parser fixes

[m6w6/ext-psi] / m4 / wchar.m4

diff --git a/m4/wchar.m4 b/m4/wchar.m4
index 83612b398804337bf4785585d756f2dcc7d1bf43..c399a061cf2dfc1860fb9b1cf5a06334e8c1daef 100644 (file)
--- a/m4/wchar.m4
+++ b/m4/wchar.m4
@@ -2,7 +2,6 @@ PSI_CHECK_WCHAR() {
        AC_CHECK_HEADERS(wchar.h)
 
        PSI_TYPE(wint_t, int)
-       PSI_TYPE(wctype_t, int)
        PSI_STRUCT(mbstate_t)
 
        PSI_CONST(WINT_MIN, int)
@@ -19,18 +18,6 @@ PSI_CHECK_WCHAR() {
        PSI_DECL(int fwscanf, [(FILE *stream, const wchar_t *format)], vararg)
        PSI_DECL(wint_t getwc, [(FILE *stream)])
        PSI_DECL(wint_t getwchar, [(void)])
-       PSI_DECL(int iswalnum, [(wint_t wc)])
-       PSI_DECL(int iswalpha, [(wint_t wc)])
-       PSI_DECL(int iswcntrl, [(wint_t wc)])
-       PSI_DECL(int iswctype, [(wint_t wc, wctype_t class)])
-       PSI_DECL(int iswdigit, [(wint_t wc)])
-       PSI_DECL(int iswgraph, [(wint_t wc)])
-       PSI_DECL(int iswlower, [(wint_t wc)])
-       PSI_DECL(int iswprint, [(wint_t wc)])
-       PSI_DECL(int iswpunct, [(wint_t wc)])
-       PSI_DECL(int iswspace, [(wint_t wc)])
-       PSI_DECL(int iswupper, [(wint_t wc)])
-       PSI_DECL(int iswxdigit, [(wint_t wc)])
        PSI_DECL(size_t mbrlen, [(const char *s, size_t n, mbstate_t *ps)])
        PSI_DECL(size_t mbrtowc, [(wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)])
        PSI_DECL(int mbsinit, [(const mbstate_t *ps)])
@@ -41,8 +28,6 @@ PSI_CHECK_WCHAR() {
        PSI_DECL(wint_t putwchar, [(wchar_t wc)])
        PSI_DECL(int swprintf, [(wchar_t *wcs, size_t maxlen, const wchar_t *format)], vararg)
        PSI_DECL(int swscanf, [(const wchar_t *ws, const wchar_t *format)], vararg)
-       PSI_DECL(wint_t towlower, [(wint_t wc)])
-       PSI_DECL(wint_t towupper, [(wint_t wc)])
        PSI_DECL(wint_t ungetwc, [(wint_t wc, FILE *stream)])
        PSI_DECL(wchar_t *wcpcpy, [(wchar_t *dest, const wchar_t *src)])
        PSI_DECL(wchar_t *wcpncpy, [(wchar_t *dest, const wchar_t *src, size_t n)])
@@ -75,15 +60,14 @@ PSI_CHECK_WCHAR() {
        PSI_DECL(float wcstof, [(const wchar_t *nptr, wchar_t **endptr)])
        PSI_DECL(wchar_t *wcstok, [(wchar_t *wcs, const wchar_t *delim, wchar_t **ptr)])
        PSI_DECL(long wcstol, [(const wchar_t *nptr, wchar_t **endptr, int base)])
-       dnl PSI_DECL(long double wcstold, [(const wchar_t *nptr, wchar_t **endptr)])
-       dnl PSI_DECL(long long wcstoll, [(const wchar_t *nptr, wchar_t **endptr, int base)])
+       PSI_DECL(long double wcstold, [(const wchar_t *nptr, wchar_t **endptr)])
+       PSI_DECL(long long wcstoll, [(const wchar_t *nptr, wchar_t **endptr, int base)])
        PSI_DECL(unsigned long wcstoul, [(const wchar_t *nptr, wchar_t **endptr, int base)])
-       dnl PSI_DECL(unsigned long long wcstoull, [(const wchar_t *nptr, wchar_t **endptr, int base)])
+       PSI_DECL(unsigned long long wcstoull, [(const wchar_t *nptr, wchar_t **endptr, int base)])
        PSI_DECL(int wcswidth, [(const wchar_t *s, size_t n)])
        PSI_DECL(size_t wcsxfrm, [(wchar_t *ws1, const wchar_t *ws2, size_t n)])
        PSI_DECL(size_t wcsxfrm_l, [(wchar_t *ws1, const wchar_t *ws2, size_t n, locale_t loc)])
        PSI_DECL(int wctob, [(wint_t c)])
-       PSI_DECL(wctype_t wctype, [(const char *name)])
        PSI_DECL(int wcwidth, [(wchar_t c)])
        PSI_DECL(wchar_t *wmemchr, [(const wchar_t *s, wchar_t c, size_t n)])
        PSI_DECL(int wmemcmp, [(const wchar_t *s1, const wchar_t *s2, size_t n)])