> From: Paul Smith <psm...@gnu.org>
> Cc: bug-make@gnu.org
> Date: Sat, 24 Sep 2022 13:42:39 -0400
> 
> On Sat, 2022-09-24 at 14:17 +0300, Eli Zaretskii wrote:
> > Here are the proposed patches:
> > 
> > --- src/function.c~0    2022-09-18 22:06:17.000000000 +0300
> > +++ src/function.c      2022-09-24 13:30:01.740875000 +0300
> > @@ -823,6 +823,15 @@ func_wordlist (char *o, char **argv, con
> >    stop = parse_numeric (argv[1],
> >                          _("invalid second argument to 'wordlist'
> > function"));
> >  
> > +#ifdef WINDOWS32
> > +  if (start < 1)
> > +    ON (fatal, *expanding_var,
> > +        "invalid first argument to 'wordlist' function: '%I64d'",
> > start);
> > +
> > +  if (stop < 0)
> > +    ON (fatal, *expanding_var,
> > +        "invalid second argument to 'wordlist' function: '%I64d'",
> > stop);
> > +#else
> >    if (start < 1)
> >      ON (fatal, *expanding_var,
> >          "invalid first argument to 'wordlist' function: '%lld'",
> > start);
> > @@ -830,6 +839,7 @@ func_wordlist (char *o, char **argv, con
> >    if (stop < 0)
> >      ON (fatal, *expanding_var,
> >          "invalid second argument to 'wordlist' function: '%lld'",
> > stop);
> > +#endif
> >  
> >    count = stop - start + 1;
> 
> I would prefer to avoid fully duplicating all the code, just to fix the
> string.  I assume that the PR* macros are not portable?

MinGW does have inttypes.h, if you want to use PRId64 or somesuch, and
if the other supported platforms have that.

I'm fine with using our own definition for PRId64, if that's what you
prefer.  On makeint.h, I presume?

Reply via email to