Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
0cf36656
Commit
0cf36656
authored
Feb 05, 2006
by
Ken Raeburn
Browse files
(malloc, realloc, free) [emacs]: Undefine macros before defining.
parent
8508e990
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
0 deletions
+7
-0
src/ChangeLog
src/ChangeLog
+3
-0
src/xrdb.c
src/xrdb.c
+4
-0
No files found.
src/ChangeLog
View file @
0cf36656
...
...
@@ -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.
...
...
src/xrdb.c
View file @
0cf36656
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment