Re: [Bug-wget] [PATCH] Fix for #43785

[Tim Ruehsen]

On Sunday 08 February 2015 11:35:21 Giuseppe Scrivano wrote:
> Tim Rühsen <address@hidden> writes:
> >> # define ngettext(Msgid1, Msgid2, N) \
> >>
> >>     ((N) == 1 \
> >>
> >>      ? ((void) (Msgid2), (const char *) (Msgid1)) \
> >>
> >>      : ((void) (Msgid1), (const char *) (Msgid2)))
> >
> > This does not work (Kiyoshi wrote a private Mail to me).
> >
> >> Or can't we just "#include <libintl.h>" on all platforms?
> >
> > I wouldn't expect this to work everywhere.
> >
> > Another idea: how often do we use ngettext ? AFAIR, only 1 or 2 times in
> > the code. So why not remove the #define and amend those two occurrences ?

> I am quite sure we are missing some gnulib integration here, as gettext
> provided there has a similar macro.  If we have no way to build it and
> check it easily, feel free to just push your version for now.

Hurray !
Guiseppe, gnulib of course.

gnulib's gettext.h basically does the same that wget.h does, but removes the
details from wget's source code ;-)

I testet the attached patch on Solaris and Linux with and without --disable-
nls.

Please also do some testing.

Tim

0001-gettext-Use-gnulib-s-gettext.h-for-compatibility.patch
Description: Text Data

signature.asc
Description: This is a digitally signed message part.