(malloc, realloc, free) [emacs]: Undefine macros before defining.

diff --git a/src/ChangeLog b/src/ChangeLog
index 4f411f954447d4cdc9f001a676fe4b2fe4810e87..166222ae33c43d2fc506dba44aa4eda12feeadf9 100644 (file)
--- 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  <storm@cua.dk>
 
        * xdisp.c: Cache last merged escape glyph face.

diff --git a/src/xrdb.c b/src/xrdb.c
index 822fb6e26246c47596430191a3c42ae88067aa37..0a138687d7bfa4bb639d73e9199831220ec1fda1 100644 (file)
--- 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