From: Waldemar Kozaczuk <[email protected]> Committer: Waldemar Kozaczuk <[email protected]> Branch: master
libc: replace iswctype_l and wctype_l.c with musl equivalent Signed-off-by: Waldemar Kozaczuk <[email protected]> Message-Id: <[email protected]> --- diff --git a/Makefile b/Makefile --- a/Makefile +++ b/Makefile @@ -1028,7 +1028,7 @@ musl += locale/iswalnum_l.o musl += locale/iswalpha_l.o musl += locale/iswblank_l.o musl += locale/iswcntrl_l.o -libc += locale/iswctype_l.o +musl += locale/iswctype_l.o musl += locale/iswdigit_l.o musl += locale/iswgraph_l.o musl += locale/iswlower_l.o @@ -1066,7 +1066,7 @@ libc += locale/wcsftime_l.o libc += locale/wcsxfrm.o libc += locale/wcsxfrm_l.o musl += locale/wctrans_l.o -libc += locale/wctype_l.o +musl += locale/wctype_l.o musl += math/__cos.o musl += math/__cosdf.o diff --git a/libc/locale/iswctype_l.c b/libc/locale/iswctype_l.c --- a/libc/locale/iswctype_l.c +++ b/libc/locale/iswctype_l.c @@ -1,11 +0,0 @@ -#include <wctype.h> -#include "libc.h" - -#undef iswctype_l -int __iswctype_l(wint_t c, wctype_t t, locale_t l) -{ - return iswctype(c, t); -} - -/* OSv local: a libstdc++ build against glibc wants the __ version */ -weak_alias(__iswctype_l, iswctype_l); diff --git a/libc/locale/wctype_l.c b/libc/locale/wctype_l.c --- a/libc/locale/wctype_l.c +++ b/libc/locale/wctype_l.c @@ -1,10 +0,0 @@ -#include <wctype.h> -#include "libc.h" - -wctype_t __wctype_l(const char *s, locale_t l) -{ - return wctype(s); -} - -/* OSv local: a libstdc++ build against glibc wants the __ version */ -weak_alias(__wctype_l, wctype_l); -- You received this message because you are subscribed to the Google Groups "OSv Development" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/osv-dev/000000000000ffccf205ad476a07%40google.com.
