Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-41
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-42
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-43
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-44
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-45
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-46
   Merge from erc--emacs--0

 * emacs@sv.gnu.org/emacs--devo--0--patch-47
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-48
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-14
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-15
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-16
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-17
   Merge from emacs--devo--0

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-507

1 files changed, 4 insertions, 0 deletions

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