diff --git a/ChangeLog b/ChangeLog
index d29acee..288294d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2002-11-03  Bruno Haible  <bruno@clisp.org>
 
+	* src/output.cc (Output::output): Set char_to_index to a cast in all
+	cases. Avoids gcc warnings on the generated code.
+
 	* src/output.cc (Output_Enum): Prepend an underscore to field names.
 	(Output_Expr1): Likewise.
 	(Output::output_hash_function): Simplify the special case for "-k 1,$".
diff --git a/src/output.cc b/src/output.cc
index bee03bb..3001689 100644
--- a/src/output.cc
+++ b/src/output.cc
@@ -1464,7 +1464,7 @@ Output::output ()
       _struct_tag = (const_always[0] ? "const char *" : "char *");
     }
 
-  char_to_index = (option[SEVENBIT] ? "" : "(unsigned char)");
+  char_to_index = "(unsigned char)";
 
   printf ("/* ");
   if (option[KRC])