From fe5e3e594adaab64bcd0b5ad5756d7822b0c6392 Mon Sep 17 00:00:00 2001
From: David Shaw <dshaw@jabberwocky.com>
Date: Mon, 7 Apr 2003 22:04:25 +0000
Subject: [PATCH] * dcigettext.c (plural_lookup): Name conflict on some
 platforms with "index".  Local fix for GnuPG.

---
 intl/ChangeLog    |  5 +++++
 intl/dcigettext.c | 10 +++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/intl/ChangeLog b/intl/ChangeLog
index 84e2b37ec..4decca8dd 100644
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -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.
diff --git a/intl/dcigettext.c b/intl/dcigettext.c
index 6acde195f..03a8830f9 100644
--- a/intl/dcigettext.c
+++ b/intl/dcigettext.c
@@ -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');