arrfab / rpms / glibc

Forked from rpms/glibc 5 years ago
Clone

Blame SOURCES/glibc-rh1505492-malloc_ptrdiff_t.patch

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