Clean up some warning messages. From Bob Bell.

diff --git a/init.c b/init.c
index 6497ab121ffd3b7735887d03bbc52f4c12339713..c744ff2663d50ffca0989f12ba7cce624cc38bd1 100644 (file)
--- a/init.c
+++ b/init.c
@@ -1330,7 +1330,6 @@ finish:
 }
 
 
-#define MAX(a,b) (((a) >= (b)) ? (a) : (b))
 #define NUMVARS (sizeof (MuttVars)/sizeof (MuttVars[0]))
 #define NUMCOMMANDS (sizeof (Commands)/sizeof (Commands[0]))
 /* initial string that starts completion. No telling how much crap 

diff --git a/muttlib.c b/muttlib.c
index f072c4d5227534930074d8d384fc4701ff2a666c..868e22433996ebc73b0aa7701ec783921b764c12 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -37,9 +37,6 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#define MIN(a,b) ((a) < (b) ? (a) : (b))
-#define MAX(a,b) ((a) < (b) ? (b) : (a))
-
 BODY *mutt_new_body (void)
 {
   BODY *p = (BODY *) safe_calloc (1, sizeof (BODY));

diff --git a/pgppubring.c b/pgppubring.c
index c48ce05b2ae298b1bb84e5762bf94eb1475d64a5..39154c25ff810e76e06a82d196665dcd7df0422f 100644 (file)
--- a/pgppubring.c
+++ b/pgppubring.c
@@ -1049,5 +1049,5 @@ static void pgpring_dump_keyblock (pgp_key_t *p)
 
 char *mutt_gettext (const char *message)
 {
-  return message;
+  return (char *)message;
 }

diff --git a/protos.h b/protos.h
index 4d5eea433e5decd1ef83b495482fb22c3332d1cd..40cbdfeef5d54c799dfe1e94b1812d5f7bea3035 100644 (file)
--- a/protos.h
+++ b/protos.h
@@ -25,6 +25,10 @@
 #define dprint(N,X) 
 #endif
 
+#undef MAX
+#undef MIN
+#define MAX(a,b) ((a) < (b) ? (b) : (a))
+#define MIN(a,b) ((a) < (b) ? (a) : (b))
 
 #define MoreArgs(p) (*p->dptr && *p->dptr != ';' && *p->dptr != '#')
 

diff --git a/snprintf.c b/snprintf.c
index 4716ee291392f30a91392400715ad07b0eaff3bd..b34ed0f8ae8cfee48642627c23aef7a41d8af1ff 100644 (file)
--- a/snprintf.c
+++ b/snprintf.c
@@ -116,7 +116,6 @@ static void dopr_outch (char *buffer, size_t *currlen, size_t maxlen, char c );
 #define DP_C_LDOUBLE 3
 
 #define char_to_int(p) (p - '0')
-#define MAX(p,q) ((p >= q) ? p : q)
 
 static void dopr (char *buffer, size_t maxlen, const char *format, va_list args)
 {