aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
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 0990941cdf2..f4dd94e8af0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12007-06-18 Sam Steingold <sds@gnu.org>
2
3 * gmalloc.c (__morecore): Fix the declaration to comply with the
4 definition.
5
12007-06-20 Juanma Barranquero <lekktu@gmail.com> 62007-06-20 Juanma Barranquero <lekktu@gmail.com>
2 7
3 * w32term.c (w32_delete_display): Remove leftover declaration. 8 * w32term.c (w32_delete_display): Remove leftover declaration.
diff --git a/src/gmalloc.c b/src/gmalloc.c
index 50535d4940c..76845828d75 100644
--- a/src/gmalloc.c
+++ b/src/gmalloc.c
@@ -373,7 +373,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.
373extern __ptr_t bss_sbrk PP ((ptrdiff_t __size)); 373extern __ptr_t bss_sbrk PP ((ptrdiff_t __size));
374extern int bss_sbrk_did_unexec; 374extern int bss_sbrk_did_unexec;
375#endif 375#endif
376__ptr_t (*__morecore) PP ((ptrdiff_t __size)) = __default_morecore; 376__ptr_t (*__morecore) PP ((__malloc_ptrdiff_t __size)) = __default_morecore;
377 377
378/* Debugging hook for `malloc'. */ 378/* Debugging hook for `malloc'. */
379__ptr_t (*__malloc_hook) PP ((__malloc_size_t __size)); 379__ptr_t (*__malloc_hook) PP ((__malloc_size_t __size));