less warnings

diff --git a/Makefile.am b/Makefile.am
index 5cf8de8..26c05d0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -152,7 +152,7 @@ keymap_alldefs.h: $(srcdir)/OPS $(srcdir)/OPS.PGP $(srcdir)/OPS.MIX $(srcdir)/OP
                $(srcdir)/OPS.MIX $(srcdir)/OPS.CRYPT $(srcdir)/OPS.SMIME \
                        > keymap_alldefs.h
 
-version.h: Makefile
+version.h: Makefile.am
        echo "#define MUTT_REVISION \"git\"" > version.h
 
 reldate:

diff --git a/hcache.h b/hcache.h
index 4998137..b23b692 100644 (file)
--- a/hcache.h
+++ b/hcache.h
@@ -11,7 +11,7 @@
 #ifndef _MUTT_HCACHE_H
 #define _MUTT_HCACHE_H
 
-#if USE_HCACHE
+#ifdef USE_HCACHE
 void *mutt_hcache_open(const char *path, const char *folder);
 void mutt_hcache_close(void *db);
 HEADER *mutt_hcache_restore(const unsigned char *d, HEADER **oh);

diff --git a/menu.c b/menu.c
index 95d4f47..d3f422e 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -31,8 +31,6 @@
 
 #define SW              (option(OPTMBOXPANE)?SidebarWidth:0)
 
-extern int Charset_is_utf8;     /* FIXME: bad modularisation */
-
 extern size_t UngetCount;
 
 static void print_enriched_string (int attr, unsigned char *s, int do_color)

diff --git a/pgppubring.c b/pgppubring.c
index 88b11e4..baf5b16 100644 (file)
--- a/pgppubring.c
+++ b/pgppubring.c
@@ -36,13 +36,13 @@
 #include <time.h>
 #ifdef HAVE_GETOPT_H
 # include <getopt.h>
-#endif
-#include <errno.h>
-
+#else
 extern char *optarg;
 extern int optind;
+#endif
+#include <errno.h>
 
-short Umask;                    /* dirty hack because we need Umask in lib.c but don't want globals.h there */
+short Umask;   /* dirty hack because we need Umask in lib.c but don't want globals.h there */
 
 #include "sha1.h"
 #include "md5.h"

diff --git a/sendlib.c b/sendlib.c
index 7c8ab2b..12729ba 100644 (file)
--- a/sendlib.c
+++ b/sendlib.c
@@ -1958,8 +1958,8 @@ static char **add_args (char **args, size_t * argslen, size_t * argsmax,
   return (args);
 }
 
-static char **add_option(const char **args, size_t * argslen, size_t * argsmax,
-                         const char *s)
+static const char **
+add_option(const char **args, size_t *argslen, size_t *argsmax, const char *s)
 {
     if (*argslen == *argsmax) {
         mem_realloc(&args, (*argsmax += 5) * sizeof (char *));
@@ -1974,7 +1974,7 @@ static int mutt_invoke_sendmail (ADDRESS * from,        /* the sender */
                                  int eightbit)
 {                               /* message contains 8bit chars */
   char *ps = NULL, *path = NULL, *s = NULL, *childout = NULL;
-  char **args = NULL;
+  const char **args = NULL;
   size_t argslen = 0, argsmax = 0;
   int i;
 
@@ -2021,7 +2021,7 @@ static int mutt_invoke_sendmail (ADDRESS * from,        /* the sender */
   if (!option (OPTNEWSSEND)) {
 #endif
     if (eightbit && option (OPTUSE8BITMIME))
-      args = add_option (args, &argslen, &argsmax, "-B8BITMIME");
+      args = add_option(args, &argslen, &argsmax, "-B8BITMIME");
 
     if (option (OPTENVFROM)) {
       ADDRESS *f = NULL;