CVS commit: src/gnu/lib/libmalloc

[Joerg Sonnenberger]

Module Name:    src
Committed By:   joerg
Date:           Wed Dec  8 01:54:21 UTC 2010

Modified Files:
        src/gnu/lib/libmalloc: mtrace.c valloc.c

Log Message:
Fix some LP64 issues


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/gnu/lib/libmalloc/mtrace.c \
    src/gnu/lib/libmalloc/valloc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/gnu/lib/libmalloc/mtrace.c
diff -u src/gnu/lib/libmalloc/mtrace.c:1.1 src/gnu/lib/libmalloc/mtrace.c:1.2
--- src/gnu/lib/libmalloc/mtrace.c:1.1	Thu Sep 23 21:11:09 1993
+++ src/gnu/lib/libmalloc/mtrace.c	Wed Dec  8 01:54:21 2010
@@ -72,8 +72,7 @@
 
 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 @@
   __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 @@
 
 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 @@
   __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 ();
Index: src/gnu/lib/libmalloc/valloc.c
diff -u src/gnu/lib/libmalloc/valloc.c:1.1 src/gnu/lib/libmalloc/valloc.c:1.2
--- src/gnu/lib/libmalloc/valloc.c:1.1	Thu Sep 23 21:11:14 1993
+++ src/gnu/lib/libmalloc/valloc.c	Wed Dec  8 01:54:21 2010
@@ -23,6 +23,7 @@
 #define	_MALLOC_INTERNAL
 #include <malloc.h>
 #endif
+#include <unistd.h>
 
 #ifdef	__GNU_LIBRARY__
 extern size_t __getpagesize __P ((void));