leftover

[apps/madmutt.git] / sendlib.c

diff --git a/sendlib.c b/sendlib.c
index b79d3c1..1926dc6 100644 (file)
--- a/sendlib.c
+++ b/sendlib.c
@@ -534,7 +534,6 @@ static ssize_t convert_file_to (FILE * file, const char *fromcode,
                                int ncodes, const char **tocodes,
                                int *tocode, CONTENT * info)
 {
-#ifdef HAVE_ICONV
   iconv_t cd1, *cd;
   char bufi[256], bufu[512], bufo[4 * sizeof (bufi)];
   const char *ib, *ub;
@@ -642,9 +641,6 @@ static ssize_t convert_file_to (FILE * file, const char *fromcode,
   p_delete(&states);
 
   return ret;
-#else
-  return -1;
-#endif /* !HAVE_ICONV */
 }
 
 /*
@@ -1653,7 +1649,7 @@ static char *mutt_gen_msgid (void)
     return m_strdup(buf);
 }
 
-static RETSIGTYPE alarm_handler (int sig __attribute__ ((unused)))
+static void alarm_handler (int sig __attribute__ ((unused)))
 {
   SigAlrm = 1;
 }
@@ -2109,7 +2105,7 @@ int mutt_write_fcc (const char *path, HEADER * hdr, const char *msgid,
   /* We need to add a Content-Length field to avoid problems where a line in
    * the message body begins with "From "   
    */
-  if (f.magic == M_MMDF || f.magic == M_MBOX) {
+  if (f.magic == M_MBOX) {
     tempfp = m_tempfile(tempfile, sizeof(tempfile), NONULL(MCore.tmpdir), NULL);
     if (!tempfp) {
       mutt_error(_("Could not create temporary file"));