diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-04-22 00:50:17 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-04-22 00:50:17 -0700 |
| commit | da05bc4c1f811079e53dbda24fb3661714f6bde1 (patch) | |
| tree | f78258c799504a24ea60a2c9ad8cc94dee874d9a /src | |
| parent | 52828e02c36f599bfe75a527fecc16ace3fb6323 (diff) | |
| download | emacs-da05bc4c1f811079e53dbda24fb3661714f6bde1.tar.gz | |
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'.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/alloc.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index fb7498b6298..a1220aeaa7d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -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. diff --git a/src/alloc.c b/src/alloc.c index b029343a848..6c9af7b71fa 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -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 (); |