Mercurial > emacs
changeset 21456:c0496e62b737
(min, max): Define as macros.
| author | Karl Heuer <kwzh@gnu.org> |
|---|---|
| date | Thu, 09 Apr 1998 18:12:46 +0000 |
| parents | 4a457fda49b5 |
| children | 8c6ea32aadfa |
| files | src/unexw32.c src/w32.c src/w32term.c |
| diffstat | 3 files changed, 15 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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;
--- 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;
--- 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;