--- a/src/lib-imap/imap-parser.c	Sat Oct 05 23:16:55 2002 +0300
+++ b/src/lib-imap/imap-parser.c	Sat Oct 05 23:39:19 2002 +0300
@@ -439,7 +439,7 @@
 
 		/* pass through to parsing data. since inbuf->skip was
 		   modified, we need to get the data start position again. */
-		data = io_buffer_get_data(parser->inbuf, &data_size);
+		data = (char *) io_buffer_get_data(parser->inbuf, &data_size);
 	case ARG_PARSE_LITERAL_DATA:
 		imap_parser_read_literal_data(parser, data, data_size);
 		break;
@@ -496,11 +496,11 @@
 
 const char *imap_parser_read_word(ImapParser *parser)
 {
-	unsigned char *data;
+	char *data;
 	size_t i, data_size;
 
 	/* get the beginning of data in input buffer */
-	data = io_buffer_get_data(parser->inbuf, &data_size);
+	data = (char *) io_buffer_get_data(parser->inbuf, &data_size);
 
 	for (i = 0; i < data_size; i++) {
 		if (data[i] == ' ' || data[i] == '\r' || data[i] == '\n')
@@ -517,11 +517,11 @@
 
 const char *imap_parser_read_line(ImapParser *parser)
 {
-	unsigned char *data;
+	char *data;
 	size_t i, data_size;
 
 	/* get the beginning of data in input buffer */
-	data = io_buffer_get_data(parser->inbuf, &data_size);
+	data = (char *) io_buffer_get_data(parser->inbuf, &data_size);
 
 	for (i = 0; i < data_size; i++) {
 		if (data[i] == '\r' || data[i] == '\n')

--- a/src/lib-index/mbox/mbox-append.c	Sat Oct 05 23:16:55 2002 +0300
+++ b/src/lib-index/mbox/mbox-append.c	Sat Oct 05 23:39:19 2002 +0300
@@ -46,7 +46,8 @@
 			break;
 	}
 
-	if (pos == size || size <= 5 || strncmp(data, "From ", 5) != 0) {
+	if (pos == size || size <= 5 ||
+	    strncmp((char *) data, "From ", 5) != 0) {
 		/* a) no \n found, or line too long
 		   b) not a From-line */
 		index_set_error(index, "Error indexing mbox file %s: "
@@ -57,7 +58,7 @@
 	}
 
 	/* parse the From-line */
-	internal_date = mbox_from_parse_date(data, size);
+	internal_date = mbox_from_parse_date((char *) data, size);
 	if (internal_date <= 0)
 		internal_date = ioloop_time;
 

--- a/src/lib-index/mbox/mbox-fsck.c	Sat Oct 05 23:16:55 2002 +0300
+++ b/src/lib-index/mbox/mbox-fsck.c	Sat Oct 05 23:39:19 2002 +0300
@@ -72,7 +72,8 @@
 		data++; size--;
 	}
 
-	return size == 0 || (size >= 5 && strncmp(data, "From ", 5) == 0);
+	return size == 0 ||
+		(size >= 5 && strncmp((char *) data, "From ", 5) == 0);
 }
 
 static int mail_update_header_size(MailIndex *index, MailIndexRecord *rec,
@@ -219,7 +220,7 @@
 	/* first make sure we start with a "From " line. If file is too
 	   small, we'll just treat it as empty mbox file. */
 	if (io_buffer_read_data_blocking(inbuf, &data, &size, 5) > 0 &&
-	    strncmp(data, "From ", 5) != 0) {
+	    strncmp((char *) data, "From ", 5) != 0) {
 		index_set_error(index, "File isn't in mbox format: %s",
 				index->mbox_path);
 		return FALSE;

--- a/src/lib-index/mbox/mbox-index.h	Sat Oct 05 23:16:55 2002 +0300
+++ b/src/lib-index/mbox/mbox-index.h	Sat Oct 05 23:39:19 2002 +0300
@@ -12,7 +12,7 @@
 	int received;
 } MboxHeaderContext;
 
-int mbox_set_syscall_error(MailIndex *index, const char *function);;
+int mbox_set_syscall_error(MailIndex *index, const char *function);
 
 void mbox_header_init_context(MboxHeaderContext *ctx, MailIndex *index);
 void mbox_header_free_context(MboxHeaderContext *ctx);

--- a/src/lib-mail/message-parser.c	Sat Oct 05 23:16:55 2002 +0300
+++ b/src/lib-mail/message-parser.c	Sat Oct 05 23:39:19 2002 +0300
@@ -389,8 +389,9 @@
 					if (msg[i-1] == '\r') value_len--;
 
 					/* and finally call the function */
-					func(part, msg + line_start, name_len,
-					     msg + colon_pos, value_len,
+					func(part,
+					     (char*) msg + line_start, name_len,
+					     (char*) msg + colon_pos, value_len,
 					     context);
 				}
 
@@ -463,8 +464,8 @@
 			    msg[line_start+1] == '-') {
 				/* possible boundary */
 				boundary = boundary_find(boundaries,
-							 msg + line_start + 2,
-							 i - line_start - 2);
+						(char *) msg + line_start + 2,
+						i - line_start - 2);
 				if (boundary != NULL)
 					break;
 			}
@@ -488,7 +489,7 @@
 			   70 chars without "--" or less. We allow
 			   a bit larger.. */
 			boundary = boundary_find(boundaries,
-						 msg + line_start + 2,
+						 (char *) msg + line_start + 2,
 						 i - line_start - 2);
 			if (boundary != NULL)
 				break;