summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1996-02-08 21:58:53 +0000
committerRichard M. Stallman <rms@gnu.org>1996-02-08 21:58:53 +0000
commit16663f82d1780c5831d52a5bc62d9eba50483295 (patch)
treeb8f13e160f425e3d35e50a2289931cad818fa4cf
parent38fd1f7cda8dbe0b5a47a2ddefceb01e70c8df39 (diff)
downloademacs-16663f82d1780c5831d52a5bc62d9eba50483295.tar.gz
(min, max): Don't define if already defined.
-rw-r--r--src/xterm.c4
1 files changed, 4 insertions, 0 deletions
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;