diff --git a/ChangeLog b/ChangeLog
index 0d01b49b36..51747c77d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,7 +31,7 @@
 2000-01-23  Ulrich Drepper  <drepper@cygnus.com>
 
 	* iconv/gconv_simple.c: Fix two problems in UTF-8 decoder.
-	Patch by Bruno Haibe <haible@ilog.fr>.
+	Patch by Bruno Haible <haible@ilog.fr>.
 
 2000-01-05  Roland McGrath  <roland@baalperazim.frob.com>
 
diff --git a/iconv/gconv_simple.c b/iconv/gconv_simple.c
index e56c5e707d..6acdd5d2b2 100644
--- a/iconv/gconv_simple.c
+++ b/iconv/gconv_simple.c
@@ -320,7 +320,7 @@ internal_ucs4_loop (const unsigned char **inptrp, const unsigned char *inend,
 	if (i < cnt || (cnt > 2 && (ch >> (5 * cnt - 4)) == 0))	      \
 	  {								      \
 	    /* This is an illegal encoding.  */				      \
-	    result = GCONV_ILLEGAL_INPUT;				      \
+	    result = __GCONV_ILLEGAL_INPUT;				      \
 	    break;							      \
 	  }								      \
 									      \