From 0cf366568ece81fa6c46fb2447e3b7f9fbb1d673 Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Sun, 5 Feb 2006 13:45:35 +0000 Subject: [PATCH] (malloc, realloc, free) [emacs]: Undefine macros before defining. --- src/ChangeLog | 3 +++ src/xrdb.c | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index 4f411f95444..166222ae33c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -5,6 +5,9 @@ * lisp.h (XPNTR) [!NO_UNION_TYPE && !HAVE_SHM && !DATA_SEG_BITS]: Cast bitfield value to EMACS_INT, to suppress gcc warning. + * xrdb.c (malloc, realloc, free) [emacs]: Undefine macros before + defining. + 2006-02-03 Kim F. Storm * xdisp.c: Cache last merged escape glyph face. diff --git a/src/xrdb.c b/src/xrdb.c index 822fb6e2624..0a138687d7b 100644 --- a/src/xrdb.c +++ b/src/xrdb.c @@ -88,6 +88,10 @@ extern char *get_system_name (); /* Make sure not to #include anything after these definitions. Let's not step on anyone's prototypes. */ #ifdef emacs +/* darwin.h may have already defined these. */ +#undef malloc +#undef realloc +#undef free #define malloc xmalloc #define realloc xrealloc #define free xfree -- 2.39.2