From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Tue, 7 Aug 2007 09:02:32 +0000 (+0000)
Subject: (__morecore): Fix the declaration to comply with the definition.
X-Git-Tag: emacs-pretest-22.1.90~1082
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e490694a089a5afd1002a283c27d53a32d684171;p=emacs.git

(__morecore): Fix the declaration to comply with the definition.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index ef9dcec6aae..cebb164ecf0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-07  Sam Steingold  <sds@gnu.org>
+
+	* gmalloc.c (__morecore): Fix the declaration to comply with the
+	definition.
+
 2007-08-07  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
 	* emacs.c (main)
diff --git a/src/gmalloc.c b/src/gmalloc.c
index 7e317eb4cc3..b1f8513c5fb 100644
--- a/src/gmalloc.c
+++ b/src/gmalloc.c
@@ -402,7 +402,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.
 extern __ptr_t bss_sbrk PP ((ptrdiff_t __size));
 extern int bss_sbrk_did_unexec;
 #endif
-__ptr_t (*__morecore) PP ((ptrdiff_t __size)) = __default_morecore;
+__ptr_t (*__morecore) PP ((__malloc_ptrdiff_t __size)) = __default_morecore;
 
 /* Debugging hook for `malloc'.  */
 __ptr_t (*__malloc_hook) PP ((__malloc_size_t __size));