--- a/src/md5.c	Mon Aug 13 11:12:06 2007 +0200
+++ b/src/md5.c	Mon Aug 13 11:13:30 2007 +0200
@@ -110,7 +110,7 @@
 static const unsigned char fillbuf[64] = { 0x80, 0 /* , 0, 0, ...  */ };
 
 
-static void md5_process_block (CONST void *, size_t, struct md5_ctx *);
+static void md5_process_block (const void *, size_t, struct md5_ctx *);
 
 
 /* Initialize structure containing state of computation.
@@ -133,7 +133,7 @@
    IMPORTANT: On some systems it is required that RESBUF is correctly
    aligned for a 32 bits value.  */
 static void *
-md5_read_ctx (CONST struct md5_ctx *ctx, void *resbuf)
+md5_read_ctx (const struct md5_ctx *ctx, void *resbuf)
 {
   ((md5_uint32 *) resbuf)[0] = SWAP (ctx->A);
   ((md5_uint32 *) resbuf)[1] = SWAP (ctx->B);
@@ -251,7 +251,7 @@
 
 
 static void
-md5_process_bytes (CONST void *buffer, size_t len, struct md5_ctx *ctx)
+md5_process_bytes (const void *buffer, size_t len, struct md5_ctx *ctx)
 {
   /* When we already have some bits in our internal buffer concatenate
      both inputs first.  */
@@ -306,7 +306,7 @@
    It is assumed that LEN % 64 == 0.  */
 
 static void
-md5_process_block (CONST void *buffer, size_t len, struct md5_ctx *ctx)
+md5_process_block (const void *buffer, size_t len, struct md5_ctx *ctx)
 {
   md5_uint32 correct_words[16];
   const md5_uint32 *words = (const md5_uint32 *) buffer;
@@ -482,7 +482,7 @@
 	{
 	  /* Attempt to autodetect the coding of the string.  This is
              VERY hit-and-miss.  */
-	  enum eol_type eol = EOL_AUTODETECT;
+	  eol_type_t eol = EOL_AUTODETECT;
 	  coding_system = Fget_coding_system (Qundecided);
 	  determine_real_coding_system (XLSTREAM (istream),
 					&coding_system, &eol);
@@ -582,8 +582,8 @@
   while (1)
     {
       Bufbyte tempbuf[1024];	/* some random amount */
-      int size_in_bytes = Lstream_read (XLSTREAM (instream),
-					tempbuf, sizeof (tempbuf));
+      ssize_t size_in_bytes =
+	Lstream_read (XLSTREAM (instream), tempbuf, sizeof (tempbuf));
       if (!size_in_bytes)
 	break;