# HG changeset patch # User Karl Heuer # Date 892145566 0 # Node ID c0496e62b737e463fdeefd3de9b4eb2e9d2ab1bf # Parent 4a457fda49b565ca26e14bac0935c2ef03759e0a (min, max): Define as macros. diff -r 4a457fda49b5 -r c0496e62b737 src/unexw32.c --- a/src/unexw32.c Thu Apr 09 17:58:28 1998 +0000 +++ b/src/unexw32.c Thu Apr 09 18:12:46 1998 +0000 @@ -47,6 +47,11 @@ #include "w32heap.h" +#undef min +#undef max +#define min(x, y) (((x) < (y)) ? (x) : (y)) +#define max(x, y) (((x) > (y)) ? (x) : (y)) + /* Basically, our "initialized" flag. */ BOOL need_to_recreate_heap = FALSE; diff -r 4a457fda49b5 -r c0496e62b737 src/w32.c --- a/src/w32.c Thu Apr 09 17:58:28 1998 +0000 +++ b/src/w32.c Thu Apr 09 18:12:46 1998 +0000 @@ -79,6 +79,11 @@ #include "ndir.h" #include "w32heap.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 -r 4a457fda49b5 -r c0496e62b737 src/w32term.c --- a/src/w32term.c Thu Apr 09 17:58:28 1998 +0000 +++ b/src/w32term.c Thu Apr 09 18:12:46 1998 +0000 @@ -49,6 +49,11 @@ #include "keyboard.h" #include "intervals.h" +#undef min +#undef max +#define min(x, y) (((x) < (y)) ? (x) : (y)) +#define max(x, y) (((x) > (y)) ? (x) : (y)) + extern void free_frame_menubar (); extern Lisp_Object Vwindow_system;