From: Thomas Roessler <roessler@does-not-exist.org>
Date: Tue, 5 Sep 2000 22:14:36 +0000 (+0000)
Subject: Clean up some warning messages.  From Bob Bell.
X-Git-Tag: mutt-1-3-9-rel~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8ce67887584e50f2dc46d23341b1c6c8acfb82ae;p=mutt

Clean up some warning messages.  From Bob Bell.
---

diff --git a/init.c b/init.c
index 6497ab12..c744ff26 100644
--- 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 f072c4d5..868e2243 100644
--- 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 c48ce05b..39154c25 100644
--- 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 4d5eea43..40cbdfee 100644
--- 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 4716ee29..b34ed0f8 100644
--- 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)
 {