Index: lib/iconv.c
===================================================================
--- lib/iconv.c	(revision 5967)
+++ lib/iconv.c	(working copy)
@@ -541,8 +541,8 @@
 			 char **outbuf, size_t *outbytesleft)
 {
 	size_t in_left=*inbytesleft, out_left=*outbytesleft;
-	const uint8 *c = (const uint8 *)*inbuf;
-	uint8 *uc = (uint8 *)*outbuf;
+	const char *c = *inbuf;
+	char *uc = *outbuf;
 
 	while (in_left >= 1 && out_left >= 2) {
 		if ((c[0] & 0x80) == 0) {
@@ -658,8 +658,8 @@
 			char **outbuf, size_t *outbytesleft)
 {
 	size_t in_left=*inbytesleft, out_left=*outbytesleft;
-	uint8 *c = (uint8 *)*outbuf;
-	const uint8 *uc = (const uint8 *)*inbuf;
+	char *c = *outbuf;
+	const char *uc = *inbuf;
 
 	while (in_left >= 2 && out_left >= 1) {
 		unsigned int codepoint;