diff --git a/ChangeLog b/ChangeLog
index 20a421b..f779aaf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2008-04-06  Bruno Haible  <bruno@clisp.org>
 
+	Avoid a gcc warning.
+	* lib/loop_unicode.h (unicode_loop_convert): Add a cast.
+
+2008-04-06  Bruno Haible  <bruno@clisp.org>
+
 	* src/iconv.c (print_version): Bump year.
 
 2008-04-06  Bruno Haible  <bruno@clisp.org>
diff --git a/lib/loop_unicode.h b/lib/loop_unicode.h
index 5dde45f..c5b0bf4 100644
--- a/lib/loop_unicode.h
+++ b/lib/loop_unicode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1999-2003, 2005-2006 Free Software Foundation, Inc.
+ * Copyright (C) 1999-2003, 2005-2006, 2008 Free Software Foundation, Inc.
  * This file is part of the GNU LIBICONV Library.
  *
  * The GNU LIBICONV Library is free software; you can redistribute it
@@ -319,7 +319,7 @@
           locals.l_outbuf = outptr;
           locals.l_outbytesleft = outleft;
           locals.l_errno = 0;
-          cd->fallbacks.mb_to_uc_fallback(inptr, incount,
+          cd->fallbacks.mb_to_uc_fallback((const char*)inptr, incount,
                                           mb_to_uc_write_replacement,
                                           &locals,
                                           cd->fallbacks.data);