X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fdropsbr.c;h=3bd5c9beeefc905c2430f1e0efd45a6bdd269592;hp=dae1c3be177a9cbfe879e8d997c1568a32bf6de8;hb=5dd6771b28c257af405d7248639ed0e3bcdce38b;hpb=008837e090c008e3afe7a9c8667070bafa091e62

diff --git a/uip/dropsbr.c b/uip/dropsbr.c
index dae1c3b..3bd5c9b 100644
--- a/uip/dropsbr.c
+++ b/uip/dropsbr.c
@@ -2,8 +2,6 @@
 /*
  * dropsbr.c -- create/read/manipulate mail drops
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
@@ -12,16 +10,10 @@
 #include <h/nmh.h>
 #include <h/utils.h>
 
-#ifndef	MMDFONLY
-# include <h/mh.h>
-# include <h/dropsbr.h>
-# include <h/mts.h>
-# include <h/tws.h>
-#else
-# include "dropsbr.h"
-# include "strings.h"
-# include "mmdfonly.h"
-#endif
+#include <h/mh.h>
+#include <h/dropsbr.h>
+#include <h/mts.h>
+#include <h/tws.h>
 
 #ifdef HAVE_ERRNO_H
 # include <errno.h>
@@ -382,7 +374,7 @@ mbx_copy (char *mailbox, int mbx_style, int md, int fd,
 			    fp = strchr(ep + 1, '\n');
 			tp = dctime(dlocaltimenow());
 			snprintf (buffer, sizeof(buffer), "From %.*s  %s",
-				fp - ep, ep, tp);
+				(int)(fp - ep), ep, tp);
 		    } else if (!strncmp (buffer, "X-Envelope-From:", 16)) {
 			/*
 			 * Change the "X-Envelope-From:" field
@@ -494,10 +486,10 @@ map_name (char *file)
     if ((dp = strchr(cp = r1bindex (file, '/'), '.')) == NULL)
 	dp = cp + strlen (cp);
     if (cp == file)
-	snprintf (buffer, sizeof(buffer), ".%.*s%s", dp - cp, cp, ".map");
+	snprintf (buffer, sizeof(buffer), ".%.*s%s", (int)(dp - cp), cp, ".map");
     else
 	snprintf (buffer, sizeof(buffer), "%.*s.%.*s%s",
-		cp - file, file, dp - cp, cp, ".map");
+		(int)(cp - file), file, (int)(dp - cp), cp, ".map");
 
     return buffer;
 }