fix some omissions and mistakes in locale_t interface definitions

diff --git a/include/wctype.h b/include/wctype.h
index ee5be7c650fbc4ffc410f1beaa2dfec19382e6a1..f7be2cb03849f735b4bcbac5ae4e050da3b96e7f 100644 (file)
--- a/include/wctype.h
+++ b/include/wctype.h
@@ -43,6 +43,30 @@ wctype_t  wctype(const char *);
 #undef iswdigit
 #define iswdigit(a) (((unsigned)(a)-L'0') < 10)
 
+#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
+ || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE)
+
+int iswalnum_l(wint_t, locale_t);
+int iswalpha_l(wint_t, locale_t);
+int iswblank_l(wint_t, locale_t);
+int iswcntrl_l(wint_t, locale_t);
+int iswdigit_l(wint_t, locale_t);
+int iswgraph_l(wint_t, locale_t);
+int iswlower_l(wint_t, locale_t);
+int iswprint_l(wint_t, locale_t);
+int iswpunct_l(wint_t, locale_t);
+int iswspace_l(wint_t, locale_t);
+int iswupper_l(wint_t, locale_t);
+int iswxdigit_l(wint_t, locale_t);
+int iswctype_l(wint_t, wctype_t, locale_t);
+wint_t towlower_l(wint_t, locale_t);
+wint_t towupper_l(wint_t, locale_t);
+wint_t towctrans_l(wint_t, wctrans_t, locale_t);
+wctrans_t wctrans_l(const char *, locale_t);
+wctype_t  wctype_l(const char *, locale_t);
+
+#endif
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/src/locale/iswalnum_l.c b/src/locale/iswalnum_l.c
index 8aaf1be6a2f0a3aa81941e94dfea88ab1bb4b238..c888060c4ce55b2d514ad1e6c7724371624749f8 100644 (file)
--- a/src/locale/iswalnum_l.c
+++ b/src/locale/iswalnum_l.c
@@ -1,6 +1,6 @@
 #include <wctype.h>
 
-wint_t iswalnum_l(wint_t c, locale_t l)
+int iswalnum_l(wint_t c, locale_t l)
 {
        return iswalnum(c);
 }

diff --git a/src/locale/iswalpha_l.c b/src/locale/iswalpha_l.c
index ebe5a05ea7adf2be8727524b2b6f003a659d737c..cd2be91e5828129c3161c0e2bacb8a4da1f7b37f 100644 (file)
--- a/src/locale/iswalpha_l.c
+++ b/src/locale/iswalpha_l.c
@@ -1,6 +1,6 @@
 #include <wctype.h>
 
-wint_t iswalpha_l(wint_t c, locale_t l)
+int iswalpha_l(wint_t c, locale_t l)
 {
        return iswalpha(c);
 }

diff --git a/src/locale/iswblank_l.c b/src/locale/iswblank_l.c
index 180a8f4314d658426c78c0aaafce519746fa87cc..f3a2691f581ffdf7c8a69235add32cd4ffbdc61f 100644 (file)
--- a/src/locale/iswblank_l.c
+++ b/src/locale/iswblank_l.c
@@ -1,6 +1,6 @@
 #include <wctype.h>
 
-wint_t iswblank_l(wint_t c, locale_t l)
+int iswblank_l(wint_t c, locale_t l)
 {
        return iswblank(c);
 }

diff --git a/src/locale/iswcntrl_l.c b/src/locale/iswcntrl_l.c
index 50e97c5a1b284efe00dd1257c0d4f201af20c1d2..7681fe092b6f87b0114725a329f2dec37c35ef92 100644 (file)
--- a/src/locale/iswcntrl_l.c
+++ b/src/locale/iswcntrl_l.c
@@ -1,6 +1,6 @@
 #include <wctype.h>
 
-wint_t iswcntrl_l(wint_t c, locale_t l)
+int iswcntrl_l(wint_t c, locale_t l)
 {
        return iswcntrl(c);
 }

diff --git a/src/locale/iswctype_l.c b/src/locale/iswctype_l.c
index be222d36cdf07ff6a967bd1f7bdb59c2ad02aa0f..1dccef63f71a90e40b4c6c1b663d3dd0864f9e1b 100644 (file)
--- a/src/locale/iswctype_l.c
+++ b/src/locale/iswctype_l.c
@@ -1,6 +1,6 @@
 #include <wctype.h>
 
-wint_t iswctype_l(wint_t c, wctype_t t, locale_t l)
+int iswctype_l(wint_t c, wctype_t t, locale_t l)
 {
        return iswctype(c, t);
 }

diff --git a/src/locale/iswdigit_l.c b/src/locale/iswdigit_l.c
index 3f567fc1585fe4829918784aa1d0fb12209928a8..3de678c24f132ff843e506015a6b893b48812059 100644 (file)
--- a/src/locale/iswdigit_l.c
+++ b/src/locale/iswdigit_l.c
@@ -1,6 +1,6 @@
 #include <wctype.h>
 
-wint_t iswdigit_l(wint_t c, locale_t l)
+int iswdigit_l(wint_t c, locale_t l)
 {
        return iswdigit(c);
 }

diff --git a/src/locale/iswgraph_l.c b/src/locale/iswgraph_l.c
index 4a8f787c3e9dd889088d517f1dd4d08e5c07e5dc..34df64fc3ba335c006608ba628be3acb2c2099ff 100644 (file)
--- a/src/locale/iswgraph_l.c
+++ b/src/locale/iswgraph_l.c
@@ -1,6 +1,6 @@
 #include <wctype.h>
 
-wint_t iswgraph_l(wint_t c, locale_t l)
+int iswgraph_l(wint_t c, locale_t l)
 {
        return iswgraph(c);
 }

diff --git a/src/locale/iswlower_l.c b/src/locale/iswlower_l.c
index 51e07f3594e1cbd11609b3f40cbf96bb0b6d70fd..c52421a043c860141a2604c54b097f2d2a5da3f8 100644 (file)
--- a/src/locale/iswlower_l.c
+++ b/src/locale/iswlower_l.c
@@ -1,6 +1,6 @@
 #include <wctype.h>
 
-wint_t iswlower_l(wint_t c, locale_t l)
+int iswlower_l(wint_t c, locale_t l)
 {
        return iswlower(c);
 }

diff --git a/src/locale/iswprint_l.c b/src/locale/iswprint_l.c
index eeacb94e89aed96c938b13514e47b12f66061bf8..73d83ab356333f6fbb2899bb0066ddcb4b1f93be 100644 (file)
--- a/src/locale/iswprint_l.c
+++ b/src/locale/iswprint_l.c
@@ -1,6 +1,6 @@
 #include <wctype.h>
 
-wint_t iswprint_l(wint_t c, locale_t l)
+int iswprint_l(wint_t c, locale_t l)
 {
        return iswprint(c);
 }

diff --git a/src/locale/iswpunct_l.c b/src/locale/iswpunct_l.c
index 60e2ccf659059aef3a28cc9f9da51315605b9a70..831e0e54419637c02b579510c0008ed9de4ff092 100644 (file)
--- a/src/locale/iswpunct_l.c
+++ b/src/locale/iswpunct_l.c
@@ -1,6 +1,6 @@
 #include <wctype.h>
 
-wint_t iswpunct_l(wint_t c, locale_t l)
+int iswpunct_l(wint_t c, locale_t l)
 {
        return iswpunct(c);
 }

diff --git a/src/locale/iswspace_l.c b/src/locale/iswspace_l.c
index befccc8fdc1c39311aab78234a21283c40e3dffb..b507e9e3a613c83b86af4dec1975361c765366ec 100644 (file)
--- a/src/locale/iswspace_l.c
+++ b/src/locale/iswspace_l.c
@@ -1,6 +1,6 @@
 #include <wctype.h>
 
-wint_t iswspace_l(wint_t c, locale_t l)
+int iswspace_l(wint_t c, locale_t l)
 {
        return iswspace(c);
 }

diff --git a/src/locale/iswupper_l.c b/src/locale/iswupper_l.c
index 867edc6332ed3ba825f1102a2fe2b49ebaabb37e..fc988ef119b49022f9cb04d4e0abbaf3c1c5ab3c 100644 (file)
--- a/src/locale/iswupper_l.c
+++ b/src/locale/iswupper_l.c
@@ -1,6 +1,6 @@
 #include <wctype.h>
 
-wint_t iswupper_l(wint_t c, locale_t l)
+int iswupper_l(wint_t c, locale_t l)
 {
        return iswupper(c);
 }

diff --git a/src/locale/iswxdigit_l.c b/src/locale/iswxdigit_l.c
index 8df3f7381f16beb0a73cb1590c1b5faf49e14dba..9527cf3e1d8c65fa22370e8c7f3aed5f07db0c9c 100644 (file)
--- a/src/locale/iswxdigit_l.c
+++ b/src/locale/iswxdigit_l.c
@@ -1,6 +1,6 @@
 #include <wctype.h>
 
-wint_t iswxdigit_l(wint_t c, locale_t l)
+int iswxdigit_l(wint_t c, locale_t l)
 {
        return iswxdigit(c);
 }