aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--manual/memory.texi4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 87029e79af..a4323b9768 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-29 Thomas Schwinge <schwinge@nic-nac-project.de>
+
+ [BZ #1261]
+ * manual/memory.texi (Hooks for Malloc): Correct prototype of
+ my_init_hook and definition of my_free_hook.
+
2005-09-12 Roland McGrath <roland@redhat.com>
[BZ #1331]
diff --git a/manual/memory.texi b/manual/memory.texi
index ee2cd75c44..0f28806a22 100644
--- a/manual/memory.texi
+++ b/manual/memory.texi
@@ -948,7 +948,7 @@ program.
#include <malloc.h>
/* Prototypes for our hooks. */
-static void *my_init_hook (void);
+static void my_init_hook (void);
static void *my_malloc_hook (size_t, const void *);
static void my_free_hook (void*, const void *);
@@ -984,7 +984,7 @@ my_malloc_hook (size_t size, const void *caller)
return result;
@}
-static void *
+static void
my_free_hook (void *ptr, const void *caller)
@{
/* Restore all old hooks */