From: Waldemar Kozaczuk <[email protected]> Committer: Nadav Har'El <[email protected]> Branch: master
libc: revert more files with "#undef" to point back to musl Just like one of the earlier patches this one also removes more files from libc/ folder that only differ by "#undef" macro which is not necessary anymore. Signed-off-by: Waldemar Kozaczuk <[email protected]> Message-Id: <[email protected]> --- diff --git a/Makefile b/Makefile --- a/Makefile +++ b/Makefile @@ -1013,31 +1013,31 @@ libc += locale/duplocale.o libc += locale/freelocale.o musl += locale/iconv.o musl += locale/intl.o -libc += locale/isalnum_l.o -libc += locale/isalpha_l.o -libc += locale/isblank_l.o -libc += locale/iscntrl_l.o -libc += locale/isdigit_l.o -libc += locale/isgraph_l.o -libc += locale/islower_l.o -libc += locale/isprint_l.o -libc += locale/ispunct_l.o -libc += locale/isspace_l.o -libc += locale/isupper_l.o -libc += locale/iswalnum_l.o -libc += locale/iswalpha_l.o -libc += locale/iswblank_l.o -libc += locale/iswcntrl_l.o +musl += locale/isalnum_l.o +musl += locale/isalpha_l.o +musl += locale/isblank_l.o +musl += locale/iscntrl_l.o +musl += locale/isdigit_l.o +musl += locale/isgraph_l.o +musl += locale/islower_l.o +musl += locale/isprint_l.o +musl += locale/ispunct_l.o +musl += locale/isspace_l.o +musl += locale/isupper_l.o +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 -libc += locale/iswdigit_l.o -libc += locale/iswgraph_l.o -libc += locale/iswlower_l.o -libc += locale/iswprint_l.o -libc += locale/iswpunct_l.o -libc += locale/iswspace_l.o -libc += locale/iswupper_l.o -libc += locale/iswxdigit_l.o -libc += locale/isxdigit_l.o +musl += locale/iswdigit_l.o +musl += locale/iswgraph_l.o +musl += locale/iswlower_l.o +musl += locale/iswprint_l.o +musl += locale/iswpunct_l.o +musl += locale/iswspace_l.o +musl += locale/iswupper_l.o +musl += locale/iswxdigit_l.o +musl += locale/isxdigit_l.o libc += locale/langinfo.o musl += locale/localeconv.o libc += locale/nl_langinfo_l.o @@ -1054,7 +1054,7 @@ libc += locale/strtof_l.o libc += locale/strtold_l.o libc += locale/strxfrm.o libc += locale/strxfrm_l.o -libc += locale/tolower_l.o +musl += locale/tolower_l.o libc += locale/toupper_l.o musl += locale/towctrans_l.o libc += locale/towlower_l.o diff --git a/libc/locale/isalnum_l.c b/libc/locale/isalnum_l.c --- a/libc/locale/isalnum_l.c +++ b/libc/locale/isalnum_l.c @@ -1,7 +0,0 @@ -#include <ctype.h> - -#undef isalnum_l -int isalnum_l(int c, locale_t l) -{ - return isalnum(c); -} diff --git a/libc/locale/isalpha_l.c b/libc/locale/isalpha_l.c --- a/libc/locale/isalpha_l.c +++ b/libc/locale/isalpha_l.c @@ -1,7 +0,0 @@ -#include <ctype.h> - -#undef isalpha_l -int isalpha_l(int c, locale_t l) -{ - return isalpha(c); -} diff --git a/libc/locale/isblank_l.c b/libc/locale/isblank_l.c --- a/libc/locale/isblank_l.c +++ b/libc/locale/isblank_l.c @@ -1,7 +0,0 @@ -#include <ctype.h> - -#undef isblank_l -int isblank_l(int c, locale_t l) -{ - return isblank(c); -} diff --git a/libc/locale/iscntrl_l.c b/libc/locale/iscntrl_l.c --- a/libc/locale/iscntrl_l.c +++ b/libc/locale/iscntrl_l.c @@ -1,7 +0,0 @@ -#include <ctype.h> - -#undef iscntrl_l -int iscntrl_l(int c, locale_t l) -{ - return iscntrl(c); -} diff --git a/libc/locale/isdigit_l.c b/libc/locale/isdigit_l.c --- a/libc/locale/isdigit_l.c +++ b/libc/locale/isdigit_l.c @@ -1,7 +0,0 @@ -#include <ctype.h> - -#undef isdigit_l -int isdigit_l(int c, locale_t l) -{ - return isdigit(c); -} diff --git a/libc/locale/isgraph_l.c b/libc/locale/isgraph_l.c --- a/libc/locale/isgraph_l.c +++ b/libc/locale/isgraph_l.c @@ -1,7 +0,0 @@ -#include <ctype.h> - -#undef isgraph_l -int isgraph_l(int c, locale_t l) -{ - return isgraph(c); -} diff --git a/libc/locale/islower_l.c b/libc/locale/islower_l.c --- a/libc/locale/islower_l.c +++ b/libc/locale/islower_l.c @@ -1,7 +0,0 @@ -#include <ctype.h> - -#undef islower_l -int islower_l(int c, locale_t l) -{ - return islower(c); -} diff --git a/libc/locale/isprint_l.c b/libc/locale/isprint_l.c --- a/libc/locale/isprint_l.c +++ b/libc/locale/isprint_l.c @@ -1,7 +0,0 @@ -#include <ctype.h> - -#undef isprint_l -int isprint_l(int c, locale_t l) -{ - return isprint(c); -} diff --git a/libc/locale/ispunct_l.c b/libc/locale/ispunct_l.c --- a/libc/locale/ispunct_l.c +++ b/libc/locale/ispunct_l.c @@ -1,7 +0,0 @@ -#include <ctype.h> - -#undef ispunct_l -int ispunct_l(int c, locale_t l) -{ - return ispunct(c); -} diff --git a/libc/locale/isspace_l.c b/libc/locale/isspace_l.c --- a/libc/locale/isspace_l.c +++ b/libc/locale/isspace_l.c @@ -1,7 +0,0 @@ -#include <ctype.h> - -#undef isspace_l -int isspace_l(int c, locale_t l) -{ - return isspace(c); -} diff --git a/libc/locale/isupper_l.c b/libc/locale/isupper_l.c --- a/libc/locale/isupper_l.c +++ b/libc/locale/isupper_l.c @@ -1,7 +0,0 @@ -#include <ctype.h> - -#undef isupper_l -int isupper_l(int c, locale_t l) -{ - return isupper(c); -} diff --git a/libc/locale/iswalnum_l.c b/libc/locale/iswalnum_l.c --- a/libc/locale/iswalnum_l.c +++ b/libc/locale/iswalnum_l.c @@ -1,7 +0,0 @@ -#include <wctype.h> - -#undef iswalnum_l -int iswalnum_l(wint_t c, locale_t l) -{ - return iswalnum(c); -} diff --git a/libc/locale/iswalpha_l.c b/libc/locale/iswalpha_l.c --- a/libc/locale/iswalpha_l.c +++ b/libc/locale/iswalpha_l.c @@ -1,7 +0,0 @@ -#include <wctype.h> - -#undef iswalpha_l -int iswalpha_l(wint_t c, locale_t l) -{ - return iswalpha(c); -} diff --git a/libc/locale/iswblank_l.c b/libc/locale/iswblank_l.c --- a/libc/locale/iswblank_l.c +++ b/libc/locale/iswblank_l.c @@ -1,7 +0,0 @@ -#include <wctype.h> - -#undef iswblank_l -int iswblank_l(wint_t c, locale_t l) -{ - return iswblank(c); -} diff --git a/libc/locale/iswcntrl_l.c b/libc/locale/iswcntrl_l.c --- a/libc/locale/iswcntrl_l.c +++ b/libc/locale/iswcntrl_l.c @@ -1,7 +0,0 @@ -#include <wctype.h> - -#undef iswcntrl_l -int iswcntrl_l(wint_t c, locale_t l) -{ - return iswcntrl(c); -} diff --git a/libc/locale/iswdigit_l.c b/libc/locale/iswdigit_l.c --- a/libc/locale/iswdigit_l.c +++ b/libc/locale/iswdigit_l.c @@ -1,7 +0,0 @@ -#include <wctype.h> - -#undef iswdigit_l -int iswdigit_l(wint_t c, locale_t l) -{ - return iswdigit(c); -} diff --git a/libc/locale/iswgraph_l.c b/libc/locale/iswgraph_l.c --- a/libc/locale/iswgraph_l.c +++ b/libc/locale/iswgraph_l.c @@ -1,7 +0,0 @@ -#include <wctype.h> - -#undef iswgraph_l -int iswgraph_l(wint_t c, locale_t l) -{ - return iswgraph(c); -} diff --git a/libc/locale/iswlower_l.c b/libc/locale/iswlower_l.c --- a/libc/locale/iswlower_l.c +++ b/libc/locale/iswlower_l.c @@ -1,7 +0,0 @@ -#include <wctype.h> - -#undef iswlower_l -int iswlower_l(wint_t c, locale_t l) -{ - return iswlower(c); -} diff --git a/libc/locale/iswprint_l.c b/libc/locale/iswprint_l.c --- a/libc/locale/iswprint_l.c +++ b/libc/locale/iswprint_l.c @@ -1,7 +0,0 @@ -#include <wctype.h> - -#undef iswprint_l -int iswprint_l(wint_t c, locale_t l) -{ - return iswprint(c); -} diff --git a/libc/locale/iswpunct_l.c b/libc/locale/iswpunct_l.c --- a/libc/locale/iswpunct_l.c +++ b/libc/locale/iswpunct_l.c @@ -1,7 +0,0 @@ -#include <wctype.h> - -#undef iswpunct_l -int iswpunct_l(wint_t c, locale_t l) -{ - return iswpunct(c); -} diff --git a/libc/locale/iswspace_l.c b/libc/locale/iswspace_l.c --- a/libc/locale/iswspace_l.c +++ b/libc/locale/iswspace_l.c @@ -1,7 +0,0 @@ -#include <wctype.h> - -#undef iswspace_l -int iswspace_l(wint_t c, locale_t l) -{ - return iswspace(c); -} diff --git a/libc/locale/iswupper_l.c b/libc/locale/iswupper_l.c --- a/libc/locale/iswupper_l.c +++ b/libc/locale/iswupper_l.c @@ -1,7 +0,0 @@ -#include <wctype.h> - -#undef iswupper_l -int iswupper_l(wint_t c, locale_t l) -{ - return iswupper(c); -} diff --git a/libc/locale/iswxdigit_l.c b/libc/locale/iswxdigit_l.c --- a/libc/locale/iswxdigit_l.c +++ b/libc/locale/iswxdigit_l.c @@ -1,7 +0,0 @@ -#include <wctype.h> - -#undef iswxdigit_l -int iswxdigit_l(wint_t c, locale_t l) -{ - return iswxdigit(c); -} diff --git a/libc/locale/isxdigit_l.c b/libc/locale/isxdigit_l.c --- a/libc/locale/isxdigit_l.c +++ b/libc/locale/isxdigit_l.c @@ -1,7 +0,0 @@ -#include <ctype.h> - -#undef isxdigit_l -int isxdigit_l(int c, locale_t l) -{ - return isxdigit(c); -} diff --git a/libc/locale/tolower_l.c b/libc/locale/tolower_l.c --- a/libc/locale/tolower_l.c +++ b/libc/locale/tolower_l.c @@ -1,7 +0,0 @@ -#include <ctype.h> - -#undef tolower_l -int tolower_l(int c, locale_t l) -{ - return tolower(c); -} -- 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/0000000000002c057505ab90bac2%40google.com.
