X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=sendlib.c;h=1926dc65ef1d4110fa16f617331150b0d1d2b0b6;hp=5ff0da1d6cda0a7b0a95a66a7bbe2bcf75057b9a;hb=455a2390989dfcfc90899785b0d8e9ac94ebd28e;hpb=0ab517261694b001d2eb17f06f167a4cdd2c7c07

diff --git a/sendlib.c b/sendlib.c
index 5ff0da1..1926dc6 100644
--- 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;
 }