diff options
| author | Ken Raeburn <[email protected]> | 2006-02-05 13:45:35 +0000 |
|---|---|---|
| committer | Ken Raeburn <[email protected]> | 2006-02-05 13:45:35 +0000 |
| commit | 0cf366568ece81fa6c46fb2447e3b7f9fbb1d673 (patch) | |
| tree | 64795649e9e92a24dca5ff55b09ade337f61d0bd | |
| parent | 8508e990c1c0b9bd69bc1d8f7fa2a57753029156 (diff) | |
(malloc, realloc, free) [emacs]: Undefine macros before defining.
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/xrdb.c | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 4f411f9544..166222ae33 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 <[email protected]> * xdisp.c: Cache last merged escape glyph face. diff --git a/src/xrdb.c b/src/xrdb.c index 822fb6e262..0a138687d7 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 |