aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorYAMAMOTO Mitsuharu2007-08-07 09:02:32 +0000
committerYAMAMOTO Mitsuharu2007-08-07 09:02:32 +0000
commite490694a089a5afd1002a283c27d53a32d684171 (patch)
tree171d50fba808d04b60fa8d350e82b04675842c7f /src
parent22ffeb19aefac57c089d3d2fa981e5b1fca37790 (diff)
downloademacs-e490694a089a5afd1002a283c27d53a32d684171.tar.gz
emacs-e490694a089a5afd1002a283c27d53a32d684171.zip
(__morecore): Fix the declaration to comply with the definition.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/gmalloc.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index ef9dcec6aae..cebb164ecf0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12007-08-07 Sam Steingold <sds@gnu.org>
2
3 * gmalloc.c (__morecore): Fix the declaration to comply with the
4 definition.
5
12007-08-07 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> 62007-08-07 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
2 7
3 * emacs.c (main) 8 * 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.
402extern __ptr_t bss_sbrk PP ((ptrdiff_t __size)); 402extern __ptr_t bss_sbrk PP ((ptrdiff_t __size));
403extern int bss_sbrk_did_unexec; 403extern int bss_sbrk_did_unexec;
404#endif 404#endif
405__ptr_t (*__morecore) PP ((ptrdiff_t __size)) = __default_morecore; 405__ptr_t (*__morecore) PP ((__malloc_ptrdiff_t __size)) = __default_morecore;
406 406
407/* Debugging hook for `malloc'. */ 407/* Debugging hook for `malloc'. */
408__ptr_t (*__malloc_hook) PP ((__malloc_size_t __size)); 408__ptr_t (*__malloc_hook) PP ((__malloc_size_t __size));