And another compilation error from yesterday's patch: In file included from /usr/i686-w64-mingw32/sys-root/mingw/include/uchar.h:28, from ./uchar.h:45, from ../../gllib/btoc32.c:23: ./wchar.h:843:62: error: macro "_GL_FUNCDECL_RPL" passed 4 arguments, but takes just 3 843 | _GL_FUNCDECL_RPL (wctob, int, (wint_t wc), _GL_ATTRIBUTE_PURE); | ^ ./wchar.h:287: note: macro "_GL_FUNCDECL_RPL" defined here 287 | #define _GL_FUNCDECL_RPL(func,rettype,parameters) \ | make[4]: *** [Makefile:11719: btoc32.o] Error 1
2024-09-16 Bruno Haible <br...@clisp.org> wchar: Fix compilation error (regression yesterday). * lib/wchar.in.h (wctob): Use _GL_FUNCATTR_RPL, _GL_FUNCATTR_SYS here as well. diff --git a/lib/wchar.in.h b/lib/wchar.in.h index 9be9a60efe..8cf956dd4c 100644 --- a/lib/wchar.in.h +++ b/lib/wchar.in.h @@ -297,12 +297,12 @@ _GL_WARN_ON_USE (btowc, "btowc is unportable - " # undef wctob # define wctob rpl_wctob # endif -_GL_FUNCDECL_RPL (wctob, int, (wint_t wc), _GL_ATTRIBUTE_PURE); +_GL_FUNCATTR_RPL (wctob, int, (wint_t wc), _GL_ATTRIBUTE_PURE); _GL_CXXALIAS_RPL (wctob, int, (wint_t wc)); # else # if !defined wctob && !@HAVE_DECL_WCTOB@ /* wctob is provided by gnulib, or wctob exists but is not declared. */ -_GL_FUNCDECL_SYS (wctob, int, (wint_t wc), _GL_ATTRIBUTE_PURE); +_GL_FUNCATTR_SYS (wctob, int, (wint_t wc), _GL_ATTRIBUTE_PURE); # endif _GL_CXXALIAS_SYS (wctob, int, (wint_t wc)); # endif