Blame SOURCES/glibc-rh1505492-malloc_ptrdiff_t.patch

25845f
commit dd54b8644c60cd7b7bee27ecaae4138e7c056c01
25845f
Author: Joseph Myers <joseph@codesourcery.com>
25845f
Date:   Fri Mar 8 16:46:45 2013 +0000
25845f
25845f
    Remove __malloc_ptrdiff_t.
25845f
25845f
Conflicts:
25845f
	malloc/malloc.h
25845f
25845f
Adjusted to keep the definition in the public <malloc.h> header file.
25845f
25845f
diff --git a/malloc/morecore.c b/malloc/morecore.c
25845f
index 8a72ba6a3d70a865..1e7b77749ff1700d 100644
25845f
--- a/malloc/morecore.c
25845f
+++ b/malloc/morecore.c
25845f
@@ -43,7 +43,7 @@ libc_hidden_proto (__sbrk)
25845f
    If INCREMENT is negative, shrink data space.  */
25845f
 __malloc_ptr_t
25845f
 __default_morecore (increment)
25845f
-     __malloc_ptrdiff_t increment;
25845f
+     ptrdiff_t increment;
25845f
 {
25845f
   __malloc_ptr_t result = (__malloc_ptr_t) __sbrk (increment);
25845f
   if (result == (__malloc_ptr_t) -1)