> From: Bruno Haible <[email protected]>
> Cc: Gavin Smith <[email protected]>, [email protected],
>  [email protected]
> Date: Fri, 27 Feb 2026 11:48:03 +0100
> 
> Eli Zaretskii wrote on 2026-02-08:
> > > https://alpha.gnu.org/gnu/texinfo/texinfo-7.2.91.tar.xz
> > 
> > Thanks, this builds cleanly with mingw.org's MinGW, with a single
> > problem in Gnulib's wctype.h.  It is the same problem as in the
> > previous pretest, since this Gnulib header was not changed.  For the
> > record, I fixed it locally like this:
> > 
> > --- ./gnulib/lib/wctype.in.h~0      2026-01-17 20:58:09.000000000 +0200
> > +++ ./gnulib/lib/wctype.in.h        2026-02-08 11:45:40.995181800 +0200
> > @@ -50,7 +50,7 @@
> >   #error "Please include config.h first."
> >  #endif
> >  
> > -#if @HAVE_WINT_T@
> > +#if @HAVE_WINT_T@ && !defined _WCHAR_H
> >  /* Solaris 2.5 has a bug: <wchar.h> must be included before <wctype.h>.  */
> >  # include <wchar.h>
> >  #endif
> > @@ -59,7 +59,7 @@
> >     isw* functions in <ctype.h>, <wchar.h> as well as in <wctype.h>.  
> > Include
> >     <ctype.h>, <wchar.h> in advance to avoid rpl_ prefix being added to the
> >     declarations.  */
> > -#if defined _WIN32 && ! defined __CYGWIN__
> > +#if defined _WIN32 && ! defined __CYGWIN__ && !defined _WCHAR_H
> >  # include <ctype.h>
> >  # include <wchar.h>
> >  #endif
> 
> Good to know that this works. Since this is very fragile stuff, I prefer
> adding an 'defined __MINGW32__' guard, so as to not affect other platforms.

Sure, that works for me.

Will these changes be installed in Gnulib?  (If you decide not to
install that, I'm okay with having to patch Gnulib locally before
building Texinfo.)

Thanks.

  • texi... Gavin Smith
    • ... Eli Zaretskii
      • ... Bruno Haible via Bug reports for the GNU Texinfo documentation system
        • ... Gavin Smith
        • ... Eli Zaretskii
          • ... Bruno Haible via Bug reports for the GNU Texinfo documentation system
            • ... Eli Zaretskii
    • ... Eli Zaretskii
      • ... Gavin Smith
        • ... Gavin Smith
          • ... Eli Zaretskii
            • ... Gavin Smith
          • ... Patrice Dumas
    • ... Eli Zaretskii
      • ... Eli Zaretskii

Reply via email to