Commit 0cf36656 authored by Ken Raeburn's avatar Ken Raeburn

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

parent 8508e990
......@@ -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.
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment