diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ceeecb705e..a57e2c1f32 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2013-03-07  Pedro Alves  <palves@redhat.com>
+
+	* charset.c (struct wchar_iterator) <input>: Change type to 'const
+	gdb_byte *'.
+	(make_wchar_iterator): Remove cast to char*.
+	(wchar_iterate): Change type of local.
+
 2013-03-07  Pedro Alves  <palves@redhat.com>
 
 	* regcache.c (regcache_xmalloc_1): Call XCALLOC with signed char
diff --git a/gdb/charset.c b/gdb/charset.c
index 165f90fb97..4cd6f205a7 100644
--- a/gdb/charset.c
+++ b/gdb/charset.c
@@ -571,7 +571,7 @@ struct wchar_iterator
   iconv_t desc;
 
   /* The input string.  This is updated as convert characters.  */
-  char *input;
+  const gdb_byte *input;
   /* The number of bytes remaining in the input.  */
   size_t bytes;
 
@@ -597,7 +597,7 @@ make_wchar_iterator (const gdb_byte *input, size_t bytes,
 
   result = XNEW (struct wchar_iterator);
   result->desc = desc;
-  result->input = (char *) input;
+  result->input = input;
   result->bytes = bytes;
   result->width = width;
 
@@ -641,7 +641,7 @@ wchar_iterate (struct wchar_iterator *iter,
   while (iter->bytes > 0)
     {
       char *outptr = (char *) &iter->out[0];
-      char *orig_inptr = iter->input;
+      const gdb_byte *orig_inptr = iter->input;
       size_t orig_in = iter->bytes;
       size_t out_avail = out_request * sizeof (gdb_wchar_t);
       size_t num;