Remove __malloc_ptrdiff_t.

diff --git a/ChangeLog b/ChangeLog
index 4d9aac9ed031fd0f7d484cfe74664f1e971c8f00..721fedb31507001568f95b54aba1347f5ecca988 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2013-03-08  Joseph Myers  <joseph@codesourcery.com>
 
+       * malloc/malloc.h (__malloc_ptrdiff_t): Remove macro.
+       * malloc/morecore.c (__default_morecore): Use ptrdiff_t instead of
+       __malloc_ptrdiff_t.
+
        * malloc/malloc.h (__malloc_size_t): Remove macro.
        * malloc/mcheck.c (old_malloc_hook): Use size_t instead of
        __malloc_size_t.

diff --git a/malloc/malloc.h b/malloc/malloc.h
index 4695b7d0ad5f608c9bf34e59eb7a363769d230bb..cd691f103c205c1e398a92b855edfce092927036 100644 (file)
--- a/malloc/malloc.h
+++ b/malloc/malloc.h
@@ -24,9 +24,6 @@
 #include <stdio.h>
 # define __malloc_ptr_t  void *
 
-/* Used by GNU libc internals. */
-#define __malloc_ptrdiff_t ptrdiff_t
-
 #ifdef _LIBC
 # define __MALLOC_HOOK_VOLATILE
 # define __MALLOC_DEPRECATED

diff --git a/malloc/morecore.c b/malloc/morecore.c
index 3b194063470441906cf0cd3e37b0128aa2028e26..57284e0a36feff766add10c073742cfccd1de30f 100644 (file)
--- a/malloc/morecore.c
+++ b/malloc/morecore.c
@@ -43,7 +43,7 @@ libc_hidden_proto (__sbrk)
    If INCREMENT is negative, shrink data space.  */
 __malloc_ptr_t
 __default_morecore (increment)
-     __malloc_ptrdiff_t increment;
+     ptrdiff_t increment;
 {
   __malloc_ptr_t result = (__malloc_ptr_t) __sbrk (increment);
   if (result == (__malloc_ptr_t) -1)