From: Paul Eggert Date: Thu, 22 Aug 2024 06:00:38 +0000 (-0700) Subject: mcel: port to uClibc-ng X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=9765bc796b3e6ceaa7a10ba07c9c2f1e272a4249;p=gnulib.git mcel: port to uClibc-ng Problem reported by Waldemar Brodkorb in: https://lists.gnu.org/r/bug-gnulib/2024-08/msg00130.html * lib/mcel.h (mcel_scan): Don’t treat uClibc-ng like glibc. --- diff --git a/ChangeLog b/ChangeLog index 5fdae94326..0bf44b8e45 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2024-08-21 Paul Eggert + + mcel: port to uClibc-ng + Problem reported by Waldemar Brodkorb in: + https://lists.gnu.org/r/bug-gnulib/2024-08/msg00130.html + * lib/mcel.h (mcel_scan): Don’t treat uClibc-ng like glibc. + 2024-08-21 Bruno Haible stdio: Fix compilation error in C++ mode on Linux/riscv64 with musl. diff --git a/lib/mcel.h b/lib/mcel.h index 7d92d24601..d9f8385155 100644 --- a/lib/mcel.h +++ b/lib/mcel.h @@ -226,7 +226,8 @@ mcel_scan (char const *p, char const *lim) /* An initial mbstate_t; initialization optimized for some platforms. For details about these and other platforms, see wchar.in.h. */ -#if defined __GLIBC__ && 2 < __GLIBC__ + (2 <= __GLIBC_MINOR__) +#if (defined __GLIBC__ && 2 < __GLIBC__ + (2 <= __GLIBC_MINOR__) \ + && !defined __UCLIBC__) /* Although only a trivial optimization, it's worth it for GNU. */ mbstate_t mbs; mbs.__count = 0; #elif (defined __FreeBSD__ || defined __DragonFly__ || defined __OpenBSD__ \