mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2025-01-05 11:45:45 +00:00
Do not undef min and max.
This commit is contained in:
parent
152180e34e
commit
76ba8dafaf
@ -1,3 +1,13 @@
|
||||
2001-10-08 Andrew Innes <andrewi@gnu.org>
|
||||
|
||||
* lisp.h [max]: Undef min and max before redefining them.
|
||||
|
||||
* w32gui.h: Do not undef min and max.
|
||||
|
||||
* w32heap.h: Do not undef min and max.
|
||||
|
||||
* s/ms-w32.h: Do not undef min and max.
|
||||
|
||||
2001-10-08 Stefan Monnier <monnier@cs.yale.edu>
|
||||
|
||||
* xdisp.c (handle_fontified_prop): Don't bind after-change-functions.
|
||||
|
@ -457,12 +457,6 @@ extern char *get_emacs_configuration_options (void);
|
||||
#endif
|
||||
#include <string.h>
|
||||
|
||||
/* Emacs takes care of ensuring that these are defined. */
|
||||
#ifdef max
|
||||
#undef max
|
||||
#undef min
|
||||
#endif
|
||||
|
||||
/* We need a little extra space, see ../../lisp/loadup.el */
|
||||
#define SYSTEM_PURESIZE_EXTRA 137500
|
||||
|
||||
|
@ -21,11 +21,6 @@ Boston, MA 02111-1307, USA. */
|
||||
#ifndef EMACS_W32GUI_H
|
||||
#define EMACS_W32GUI_H
|
||||
#include <windows.h>
|
||||
/* Emacs takes care of ensuring that these are defined. */
|
||||
#ifdef max
|
||||
#undef max
|
||||
#undef min
|
||||
#endif
|
||||
|
||||
#include "w32bdf.h"
|
||||
|
||||
|
@ -25,11 +25,6 @@ Boston, MA 02111-1307, USA.
|
||||
#define NTHEAP_H_
|
||||
|
||||
#include <windows.h>
|
||||
/* Emacs takes care of ensuring that these are defined. */
|
||||
#ifdef max
|
||||
#undef max
|
||||
#undef min
|
||||
#endif
|
||||
|
||||
#define ROUND_UP(p, align) (((DWORD)(p) + (align)-1) & ~((align)-1))
|
||||
#define ROUND_DOWN(p, align) ((DWORD)(p) & ~((align)-1))
|
||||
|
Loading…
Reference in New Issue
Block a user