procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix GC_MALLOC_CHECK debugging output on 64-bit hosts.

Browse source 
* alloc.c (emacs_blocked_malloc) [GC_MALLOC_CHECK]:
Do not assume ptrdiff_t is the same width as 'int'.
This commit is contained in:
Paul Eggert 2012-04-22 00:50:17 -07:00
parent 52828e02c3
commit da05bc4c1f
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -1,5 +1,9 @@
2012-04-22 Paul Eggert <eggert@cs.ucla.edu>
Fix GC_MALLOC_CHECK debugging output on 64-bit hosts.
* alloc.c (emacs_blocked_malloc) [GC_MALLOC_CHECK]:
Do not assume ptrdiff_t is the same width as 'int'.
* alloc.c: Handle unusual debugging option combinations.
(GC_CHECK_MARKED_OBJECTS): Undef if ! GC_MARK_STACK,
since the two debugging options are incompatible.

2
src/alloc.c
View file

@ -1314,7 +1314,7 @@ emacs_blocked_malloc (size_t size, const void *ptr)
{
fprintf (stderr, "Malloc returned %p which is already in use\n",
value);
fprintf (stderr, "Region in use is %p...%p, %u bytes, type %d\n",
fprintf (stderr, "Region in use is %p...%p, %td bytes, type %d\n",
m->start, m->end, (char *) m->end - (char *) m->start,
m->type);
abort ();