--- intl/dcigettext.c.orig	Sat May  4 18:10:13 2002
+++ intl/dcigettext.c	Tue Feb 15 03:50:16 2005
@@ -57,11 +57,6 @@ extern int errno;
 #include <stdlib.h>
 
 #include <string.h>
-#if !HAVE_STRCHR && !defined _LIBC
-# ifndef strchr
-#  define strchr index
-# endif
-#endif
 
 #if defined HAVE_UNISTD_H || defined _LIBC
 # include <unistd.h>
@@ -868,7 +863,7 @@ _nl_find_msg (domain_file, domainbinding
 
 	      outleft = freemem_size - sizeof (size_t);
 	      if (iconv (domain->conv,
-			 (ICONV_CONST char **) &inptr, &inleft,
+			 (const char **) &inptr, &inleft,
 			 &outptr, &outleft)
 		  != (size_t) (-1))
 		{