From: Richard M. Stallman <rms@gnu.org>
Date: Thu, 8 Feb 1996 21:58:53 +0000 (+0000)
Subject: (min, max): Don't define if already defined.
X-Git-Tag: emacs-19.34~1338
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e4b68333a91de6400e2c0906dee7054eb200364e;p=emacs.git

(min, max): Don't define if already defined.
---

diff --git a/src/xterm.c b/src/xterm.c
index 091690e1d19..1c22b48e0b7 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -115,8 +115,12 @@ extern void _XEditResCheckMessages ();
 #include <X11/Xlibint.h>
 #endif
 
+#ifndef min
 #define min(a,b) ((a)<(b) ? (a) : (b))
+#endif
+#ifndef max
 #define max(a,b) ((a)>(b) ? (a) : (b))
+#endif
 
 /* This is a chain of structures for all the X displays currently in use.  */
 struct x_display_info *x_display_list;