From: Joseph Myers <joseph@codesourcery.com>
Date: Fri, 8 Mar 2013 16:46:45 +0000 (+0000)
Subject: Remove __malloc_ptrdiff_t.
X-Git-Tag: glibc-2.18~570
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dd54b8644c60cd7b7bee27ecaae4138e7c056c01;p=thirdparty%2Fglibc.git

Remove __malloc_ptrdiff_t.
---

diff --git a/ChangeLog b/ChangeLog
index 4d9aac9ed03..721fedb3150 100644
--- 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 4695b7d0ad5..cd691f103c2 100644
--- 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 3b194063470..57284e0a36f 100644
--- 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)