* dcigettext.c (plural_lookup): Name conflict on some platforms with

"index".  Local fix for GnuPG.
This commit is contained in:
David Shaw 2003-04-07 22:04:25 +00:00
parent c88bc35372
commit fe5e3e594a
2 changed files with 10 additions and 5 deletions

View File

@ -1,3 +1,8 @@
2003-04-07 David Shaw <dshaw@jabberwocky.com>
* dcigettext.c (plural_lookup): Name conflict on some platforms
with "index". Local fix for GnuPG.
2001-09-13 GNU <bug-gnu-utils@gnu.org>
* Version 0.10.40 released.

View File

@ -974,18 +974,18 @@ plural_lookup (domain, n, translation, translation_len)
size_t translation_len;
{
struct loaded_domain *domaindata = (struct loaded_domain *) domain->data;
unsigned long int index;
unsigned long int ind; /* gnupg */
const char *p;
index = plural_eval (domaindata->plural, n);
if (index >= domaindata->nplurals)
ind = plural_eval (domaindata->plural, n); /* gnupg */
if (ind >= domaindata->nplurals) /* gnupg */
/* This should never happen. It means the plural expression and the
given maximum value do not match. */
index = 0;
ind = 0; /* gnupg */
/* Skip INDEX strings at TRANSLATION. */
p = translation;
while (index-- > 0)
while (ind-- > 0) /* gnupg */
{
#ifdef _LIBC
p = __rawmemchr (p, '\0');