Don't define min/max.

diff --git a/src/ChangeLog b/src/ChangeLog
index 0b1712559e30773f7325217754e47a2c42f79b9b..4e5a211d82e61c1807910c84fcbf9d30750b02ae 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,14 @@
 2001-10-08  Gerd Moellmann  <gerd@gnu.org>
 
+       * xterm.c, xmenu.c, xfns.c, xdisp.c, window.c: 
+       * w32term.c, w32menu.c, w32console.c, w32bdf.c, w32.c, term.c
+       * sysdep.c, sound.c, search.c, scroll.c, minibuf.c, keymap.c 
+       * intervals.c, insdel.c, indent.c, fns.c, fileio.c, editfns.c
+       * dispnew.c, dired.c, charset.c, xfaces.c, alloc.c, atimer.c: 
+       Don't define min/max.
+
+       * lisp.h (min, max): New macros.
+
        * puresize.h (BASE_PURESIZE): Increase to 725000.
 
 2001-10-08  Pavel Jan\e,Bm\e(Bk  <Pavel@Janik.cz>

diff --git a/src/alloc.c b/src/alloc.c
index 0d6b1b2225fbba62fbeab2d684e1d5e5b573ece7..059c35a00743b0f2b35b0bc2c25d8a276fb8c0ce 100644 (file)
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -80,9 +80,6 @@ extern __malloc_size_t __malloc_extra_blocks;
 
 #endif /* not DOUG_LEA_MALLOC */
 
-#define max(A,B) ((A) > (B) ? (A) : (B))
-#define min(A,B) ((A) < (B) ? (A) : (B))
-
 /* Macro to verify that storage intended for Lisp objects is not
    out of range to fit in the space for a pointer.
    ADDRESS is the start of the block, and SIZE

diff --git a/src/atimer.c b/src/atimer.c
index d2e2bc7b8908b370083167e817c56c00b999c0ee..6bf685cec3cdc2883876926fb0fe65c9b841c20f 100644 (file)
--- a/src/atimer.c
+++ b/src/atimer.c
@@ -35,11 +35,6 @@ Boston, MA 02111-1307, USA.  */
 #include <sys/time.h>
 #endif
 
-/* The ubiquitous min/max macros.  */
-
-#define max(X, Y) ((X) > (Y) ? (X) : (Y))
-#define min(X, Y) ((X) < (Y) ? (X) : (Y))
-
 /* Free-list of atimer structures.  */
 
 static struct atimer *free_atimers;

diff --git a/src/charset.c b/src/charset.c
index b346f661e59c2c6243b4009722c4ea952c715fb1..38d22121f98669bbad8a473d3a586082e6c0472d 100644 (file)
--- a/src/charset.c
+++ b/src/charset.c
@@ -107,8 +107,6 @@ Lisp_Object Vnonascii_translation_table;
 /* List of all possible generic characters.  */
 Lisp_Object Vgeneric_character_list;
 
-#define min(X, Y) ((X) < (Y) ? (X) : (Y))
-#define max(X, Y) ((X) > (Y) ? (X) : (Y))
 \f
 void
 invalid_character (c)

diff --git a/src/dired.c b/src/dired.c
index 04535012d9003cbb0c2bd34d7dee0845df223de8..74d0bab6a6cd423040484688647776ca2fcaff27 100644 (file)
--- a/src/dired.c
+++ b/src/dired.c
@@ -98,8 +98,6 @@ extern struct re_pattern_buffer *compile_pattern ();
 /* From filemode.c.  Can't go in Lisp.h because of `stat'.  */
 extern void filemodestring P_ ((struct stat *, char *));
 
-#define min(a, b) ((a) < (b) ? (a) : (b))
-
 /* if system does not have symbolic links, it does not have lstat.
    In that case, use ordinary stat instead.  */
 

diff --git a/src/dispnew.c b/src/dispnew.c
index 02ce752692d52bf3dafbc635cb035caea560a828..0b91c69854c6c794c12b77b950153ebe7d753ec4 100644 (file)
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -75,9 +75,6 @@ Boston, MA 02111-1307, USA.  */
 #include <unistd.h>
 #endif
 
-#define max(a, b) ((a) > (b) ? (a) : (b))
-#define min(a, b) ((a) < (b) ? (a) : (b))
-
 /* Get number of chars of output now in the buffer of a stdio stream.
    This ought to be built in in stdio, but it isn't.  Some s- files
    override this because their stdio internals differ.  */

diff --git a/src/editfns.c b/src/editfns.c
index fba78c3a1be5da8ce910e9fcf518dd394591027f..bb92f44381e6bc4c219a55c8c724bada4cb7c5ff 100644 (file)
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -51,9 +51,6 @@ Boston, MA 02111-1307, USA.  */
 #define MAX_10_EXP     310
 #endif
 
-#define min(a, b) ((a) < (b) ? (a) : (b))
-#define max(a, b) ((a) > (b) ? (a) : (b))
-
 #ifndef NULL
 #define NULL 0
 #endif

diff --git a/src/fileio.c b/src/fileio.c
index 4c7921752a5cee5f0f7018c3f419702b67b6b01c..0a726a4a01afea0e36740e8cecb64e0f725ac2e7 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -159,9 +159,6 @@ extern int use_dialog_box;
 #  define lstat stat
 #endif
 
-#define min(a, b) ((a) < (b) ? (a) : (b))
-#define max(a, b) ((a) > (b) ? (a) : (b))
-
 /* Nonzero during writing of auto-save files */
 int auto_saving;
 

diff --git a/src/fns.c b/src/fns.c
index b8cc9566d22f76208de5375c3c76a4759647136c..8497b065bfdd82b40d88658c0b33d246493df081 100644 (file)
--- a/src/fns.c
+++ b/src/fns.c
@@ -50,11 +50,6 @@ Boston, MA 02111-1307, USA.  */
 #define NULL (void *)0
 #endif
 
-#ifndef min
-#define min(a, b) ((a) < (b) ? (a) : (b))
-#define max(a, b) ((a) > (b) ? (a) : (b))
-#endif
-
 /* Nonzero enables use of dialog boxes for questions
    asked by mouse commands.  */
 int use_dialog_box;

diff --git a/src/indent.c b/src/indent.c
index 2d0ea9fcae96ad3632baf4669b8d331fbd2dbc89..04768e37f2a4d2d3594eda5833f3115d65b4c35a 100644 (file)
--- a/src/indent.c
+++ b/src/indent.c
@@ -39,9 +39,6 @@ Boston, MA 02111-1307, USA.  */
 
 int indent_tabs_mode;
 
-#define min(a, b) ((a) < (b) ? (a) : (b))
-#define max(a, b) ((a) > (b) ? (a) : (b))
-
 #define CR 015
 
 /* These three values memoize the current column to avoid recalculation.  */

diff --git a/src/insdel.c b/src/insdel.c
index f87dc137b56348e7189637eb000b59cff3c50854..7963ae0f328a0302a5446b27da65dc1d3f0a8b74 100644 (file)
--- a/src/insdel.c
+++ b/src/insdel.c
@@ -33,9 +33,6 @@ Boston, MA 02111-1307, USA.  */
 #define NULL 0
 #endif
 
-#define min(x, y) ((x) < (y) ? (x) : (y))
-#define max(x, y) ((x) > (y) ? (x) : (y))
-
 static void insert_from_string_1 P_ ((Lisp_Object, int, int, int, int, int, int));
 static void insert_from_buffer_1 ();
 static void gap_left P_ ((int, int, int));

diff --git a/src/intervals.c b/src/intervals.c
index 1dfc901a3ec655d29e45035e722aa36690a4a60c..731a0f99121f5dae6151b8ef61fb289be51fb04e 100644 (file)
--- a/src/intervals.c
+++ b/src/intervals.c
@@ -51,8 +51,6 @@ Boston, MA 02111-1307, USA.  */
 
 #define TMEM(sym, set) (CONSP (set) ? ! NILP (Fmemq (sym, set)) : ! NILP (set))
 
-#define min(x, y) ((x) < (y) ? (x) : (y))
-
 Lisp_Object merge_properties_sticky ();
 static INTERVAL reproduce_tree P_ ((INTERVAL, INTERVAL));
 static INTERVAL reproduce_tree_obj P_ ((INTERVAL, Lisp_Object));

diff --git a/src/keymap.c b/src/keymap.c
index 82ee642923c1b3ff1876131976dbe9ea58bf9776..8f4a1cc478acd0b7e1a0a83257c5d50a765e6c63 100644 (file)
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -32,8 +32,6 @@ Boston, MA 02111-1307, USA.  */
 #include "puresize.h"
 #include "intervals.h"
 
-#define min(a, b) ((a) < (b) ? (a) : (b))
-
 /* The number of elements in keymap vectors.  */
 #define DENSE_TABLE_SIZE (0200)
 

diff --git a/src/minibuf.c b/src/minibuf.c
index cf98cc98b3bf843fd41e8594297fc66d6292ef84..8a1923d0ef65669cdbd0e28c41776ca4e9055586 100644 (file)
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -33,8 +33,6 @@ Boston, MA 02111-1307, USA.  */
 #include "syntax.h"
 #include "intervals.h"
 
-#define min(a, b) ((a) < (b) ? (a) : (b))
-
 extern int quit_char;
 
 /* List of buffers for use as minibuffers.

diff --git a/src/scroll.c b/src/scroll.c
index 83e029f417cfe3f7a43729c5ae85ebcc03835dec..5e45725ae30d712a78faab8bf217bc2874588874 100644 (file)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -29,9 +29,6 @@ Boston, MA 02111-1307, USA.  */
 #include "frame.h"
 #include "window.h"
 
-#define max(a, b) ((a) > (b) ? (a) : (b))
-#define min(a, b) ((a) < (b) ? (a) : (b))
-
 /* All costs measured in characters.
    So no cost can exceed the area of a frame, measured in characters.
    Let's hope this is never more than 1000000 characters.  */

diff --git a/src/search.c b/src/search.c
index c923c2b2374d1fc30298c8e0f356283585ac0adc..d9bddffeabffbd227dd0f058a705185558747fd5 100644 (file)
--- a/src/search.c
+++ b/src/search.c
@@ -33,9 +33,6 @@ Boston, MA 02111-1307, USA.  */
 #include <sys/types.h>
 #include "regex.h"
 
-#define min(a, b) ((a) < (b) ? (a) : (b))
-#define max(a, b) ((a) > (b) ? (a) : (b))
-
 #define REGEXP_CACHE_SIZE 20
 
 /* If the regexp is non-nil, then the buffer contains the compiled form

diff --git a/src/sound.c b/src/sound.c
index e5c800596565e159c284f050188b5a2f3cc85f3f..1c2d59e05b6cde39e7ae907e5e6c686c38ee82b6 100644 (file)
--- a/src/sound.c
+++ b/src/sound.c
@@ -53,8 +53,6 @@ Boston, MA 02111-1307, USA.  */
 #define DEFAULT_SOUND_DEVICE "/dev/dsp"
 #endif
 
-#define max(X, Y) ((X) > (Y) ? (X) : (Y))
-#define min(X, Y) ((X) < (Y) ? (X) : (Y))
 #define abs(X)    ((X) < 0 ? -(X) : (X))
 
 /* Structure forward declarations.  */

diff --git a/src/sysdep.c b/src/sysdep.c
index 5f528f0f51c2b8ce37518cb31411c869f3b60b12..ba68a9d4e937779faf52f0aa83b8bd03d4c2469f 100644 (file)
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -58,8 +58,6 @@ static int delete_exited_processes;
 #endif
 #endif  /* macintosh */
 
-#define min(x,y) ((x) > (y) ? (y) : (x))
-
 #ifdef WINDOWSNT
 #define read sys_read
 #define write sys_write

diff --git a/src/term.c b/src/term.c
index 6cdfa8d43551c67069bddb138730de0508ed2bc1..dcdbe9dddac70537141169c04fda82fb13ab64ac 100644 (file)
--- a/src/term.c
+++ b/src/term.c
@@ -63,9 +63,6 @@ static void turn_off_face P_ ((struct frame *, int face_id));
 static void tty_show_cursor P_ ((void));
 static void tty_hide_cursor P_ ((void));
 
-#define max(a, b) ((a) > (b) ? (a) : (b))
-#define min(a, b) ((a) < (b) ? (a) : (b))
-
 #define OUTPUT(a) \
      tputs (a, (int) (FRAME_HEIGHT (XFRAME (selected_frame)) - curY), cmputc)
 #define OUTPUT1(a) tputs (a, 1, cmputc)

diff --git a/src/w32.c b/src/w32.c
index f5ea84a6111a0339fc487f2a4d9b17416610b495..3703347d810493ae0437d56052d6f1d7524c0d82 100644 (file)
--- a/src/w32.c
+++ b/src/w32.c
@@ -88,11 +88,6 @@ Boston, MA 02111-1307, USA.
 #include "w32heap.h"
 #include "systime.h"
 
-#undef min
-#undef max
-#define min(x, y) (((x) < (y)) ? (x) : (y))
-#define max(x, y) (((x) > (y)) ? (x) : (y))
-
 extern Lisp_Object Vw32_downcase_file_names;
 extern Lisp_Object Vw32_generate_fake_inodes;
 extern Lisp_Object Vw32_get_true_file_attributes;

diff --git a/src/w32bdf.c b/src/w32bdf.c
index aa79cb5c379479e02c4e2319ff07fab67cb68233..b3df164504462430ba048c2cac5001e4b5fd35a0 100644 (file)
--- a/src/w32bdf.c
+++ b/src/w32bdf.c
@@ -34,9 +34,6 @@ Boston, MA 02111-1307, USA.  */
 #include "w32term.h"
 #include "w32bdf.h"
 
-#define min(a, b) ((a) < (b) ? (a) : (b))
-#define max(a, b) ((a) > (b) ? (a) : (b))
-
 /* 10 planes */
 #define BDF_CODEPOINT_HEAP_INITIAL_SIZE (96 * 10)
 /* about 96 characters */

diff --git a/src/w32console.c b/src/w32console.c
index 766a5ddf485fde6ae3459065b6a6c296a20d419c..1f9a5cb2d5f8130ac9a1f0180d80b94c3039f6b1 100644 (file)
--- a/src/w32console.c
+++ b/src/w32console.c
@@ -41,8 +41,6 @@ Boston, MA 02111-1307, USA.
 #include "frame.h"
 #include "w32inevt.h"
 
-#define min(a, b) ((a) < (b) ? (a) : (b))
-
 /* from window.c */
 extern Lisp_Object Frecenter ();
 

diff --git a/src/w32menu.c b/src/w32menu.c
index 8021dece951ffc8f475ec12afef1b02c7254f0fe..d627d889db5c2f87d0fd7ab45320f12e278450de 100644 (file)
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -113,9 +113,6 @@ typedef struct _widget_value
 
 /******************************************************************/
 
-#define min(x,y) (((x) < (y)) ? (x) : (y))
-#define max(x,y) (((x) > (y)) ? (x) : (y))
-
 #ifndef TRUE
 #define TRUE 1
 #define FALSE 0

diff --git a/src/w32term.c b/src/w32term.c
index 201a533151524556bfe2828a514033fa66b8e47c..ba4326f94e64383fede21892266b9845cb93feb2 100644 (file)
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -56,13 +56,6 @@ Boston, MA 02111-1307, USA.  */
 #include "composite.h"
 #include "coding.h"
 
-#ifndef min
-#define min(a,b) ((a) < (b) ? (a) : (b))
-#endif
-#ifndef max
-#define max(a,b) ((a) > (b) ? (a) : (b))
-#endif
-
 #define abs(x) ((x) < 0 ? -(x) : (x))
 
 #define BETWEEN(X, LOWER, UPPER)  ((X) >= (LOWER) && (X) < (UPPER))

diff --git a/src/window.c b/src/window.c
index 95caf8780648b1df41f1b5c007c537da958aaa3d..b486a38b9d2ce8d6a2843bb576fe676c32994d08 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -221,8 +221,6 @@ Lisp_Object Vscroll_preserve_screen_position;
 static int inhibit_frame_unsplittable;
 #endif /* 0 */
 
-#define min(a, b) ((a) < (b) ? (a) : (b))
-
 extern int scroll_margin;
 
 extern Lisp_Object Qwindow_scroll_functions, Vwindow_scroll_functions;

diff --git a/src/xdisp.c b/src/xdisp.c
index 09bc0f8185ab40781cda8516260d8ef9a23cbe81..cb092ccfe00aa4507d7fbf0bef8cec2a687d00e2 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -198,9 +198,6 @@ Boston, MA 02111-1307, USA.  */
 #include "macterm.h"
 #endif
 
-#define min(a, b) ((a) < (b) ? (a) : (b))
-#define max(a, b) ((a) > (b) ? (a) : (b))
-
 #define INFINITY 10000000
 
 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) || defined (macintosh)

diff --git a/src/xfaces.c b/src/xfaces.c
index 945416542381c0baed72fdb37ccea4f03f2d220a..867dcb8315a1bf78f0160da537c90adc979e127c 100644 (file)
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -288,11 +288,7 @@ x_free_gc (f, gc)
 #include <stdio.h>
 #include <ctype.h>
 
-#ifndef max
-#define max(A, B)      ((A) > (B) ? (A) : (B))
-#define min(A, B)      ((A) < (B) ? (A) : (B))
 #define abs(X)         ((X) < 0 ? -(X) : (X))
-#endif
 
 /* Number of pt per inch (from the TeXbook).  */
 

diff --git a/src/xfns.c b/src/xfns.c
index 3f61e643159220632da4c7925845bb303d13d648..c28a2f801eb3745e7140104d82b326fe6a147dd1 100644 (file)
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -117,9 +117,6 @@ static Lisp_Object Vmotif_version_string;
 
 #endif /* USE_X_TOOLKIT */
 
-#define min(a,b) ((a) < (b) ? (a) : (b))
-#define max(a,b) ((a) > (b) ? (a) : (b))
-
 #ifdef HAVE_X11R4
 #define MAXREQUEST(dpy) (XMaxRequestSize (dpy))
 #else

diff --git a/src/xmenu.c b/src/xmenu.c
index b33e8f0e591e56f609ca8e393d24bee97754fe82..6a7b86b1e109884fc0464e2610098c51063e9257 100644 (file)
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -81,9 +81,6 @@ Boston, MA 02111-1307, USA.  */
 #endif /* not USE_X_TOOLKIT */
 #endif /* HAVE_X_WINDOWS */
 
-#define min(x,y) (((x) < (y)) ? (x) : (y))
-#define max(x,y) (((x) > (y)) ? (x) : (y))
-
 #ifndef TRUE
 #define TRUE 1
 #define FALSE 0

diff --git a/src/xterm.c b/src/xterm.c
index 702a1fd4c3a1babd1dededc51ceec11ff194c4e8..1dffe8da1b59a8470220c483f192c511935d2819 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -144,13 +144,6 @@ extern void _XEditResCheckMessages ();
 #endif
 #endif
 
-#ifndef min
-#define min(a,b) ((a) < (b) ? (a) : (b))
-#endif
-#ifndef max
-#define max(a,b) ((a) > (b) ? (a) : (b))
-#endif
-
 #define abs(x) ((x) < 0 ? -(x) : (x))
 
 #define BETWEEN(X, LOWER, UPPER)  ((X) >= (LOWER) && (X) < (UPPER))