diff options
| author | joerg <joerg@NetBSD.org> | 2010-12-08 01:54:21 +0000 |
|---|---|---|
| committer | joerg <joerg@NetBSD.org> | 2010-12-08 01:54:21 +0000 |
| commit | ee73fca0bd0d88e63b38a0acf54670ad854f2fd2 (patch) | |
| tree | ad6d3a33177611dee828975ef5f988b5ead76e91 /gnu/lib/libmalloc | |
| parent | 16b7a5984542ea4e5da307afaa68718c577f961c (diff) | |
Fix some LP64 issues
Diffstat (limited to 'gnu/lib/libmalloc')
| -rw-r--r-- | gnu/lib/libmalloc/mtrace.c | 13 | ||||
| -rw-r--r-- | gnu/lib/libmalloc/valloc.c | 1 |
2 files changed, 6 insertions, 8 deletions
diff --git a/gnu/lib/libmalloc/mtrace.c b/gnu/lib/libmalloc/mtrace.c index 5dae86aa808..1ce5549735b 100644 --- a/gnu/lib/libmalloc/mtrace.c +++ b/gnu/lib/libmalloc/mtrace.c @@ -72,8 +72,7 @@ tr_freehook (ptr) static __ptr_t tr_mallochook __P ((size_t)); static __ptr_t -tr_mallochook (size) - size_t size; +tr_mallochook(size_t size) { __ptr_t hdr; @@ -82,7 +81,7 @@ tr_mallochook (size) __malloc_hook = tr_mallochook; /* We could be printing a NULL here; that's OK. */ - fprintf (mallstream, "+ %p %x\n", hdr, size); + fprintf (mallstream, "+ %p %zx\n", hdr, size); if (hdr == mallwatch) tr_break (); @@ -92,9 +91,7 @@ tr_mallochook (size) static __ptr_t tr_reallochook __P ((__ptr_t, size_t)); static __ptr_t -tr_reallochook (ptr, size) - __ptr_t ptr; - size_t size; +tr_reallochook (__ptr_t ptr, size_t size) { __ptr_t hdr; @@ -110,9 +107,9 @@ tr_reallochook (ptr, size) __realloc_hook = tr_reallochook; if (hdr == NULL) /* Failed realloc. */ - fprintf (mallstream, "! %p %x\n", ptr, size); + fprintf (mallstream, "! %p %zx\n", ptr, size); else - fprintf (mallstream, "< %p\n> %p %x\n", ptr, hdr, size); + fprintf (mallstream, "< %p\n> %p %zx\n", ptr, hdr, size); if (hdr == mallwatch) tr_break (); diff --git a/gnu/lib/libmalloc/valloc.c b/gnu/lib/libmalloc/valloc.c index fcf117447f0..85cabcad756 100644 --- a/gnu/lib/libmalloc/valloc.c +++ b/gnu/lib/libmalloc/valloc.c @@ -23,6 +23,7 @@ Cambridge, MA 02139, USA. #define _MALLOC_INTERNAL #include <malloc.h> #endif +#include <unistd.h> #ifdef __GNU_LIBRARY__ extern size_t __getpagesize __P ((void)); |
