andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Ken Raeburn 2006-02-05 13:45:35 +00:00
parent 8508e990c1
commit 0cf366568e
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/ChangeLog
View file

@ -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.

4
src/xrdb.c
View file

@ -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