From: Ken Raeburn <raeburn@raeburn.org>
Date: Sun, 5 Feb 2006 13:45:35 +0000 (+0000)
Subject: (malloc, realloc, free) [emacs]: Undefine macros before defining.
X-Git-Tag: emacs-pretest-22.0.90~4361
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0cf366568ece81fa6c46fb2447e3b7f9fbb1d673;p=emacs.git

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

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  <storm@cua.dk>
 
 	* 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