r1187 - in glibc-package/trunk/debian: . patches
Author: aurel32
Date: 2006-02-18 15:42:21 +0000 (Sat, 18 Feb 2006)
New Revision: 1187
Added:
glibc-package/trunk/debian/patches/glibc-manual-memory.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* Fix example code showing how to use hooks for malloc. (Closes:
bug#333565).
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-02-17 22:30:20 UTC (rev 1186)
+++ glibc-package/trunk/debian/changelog 2006-02-18 15:42:21 UTC (rev 1187)
@@ -38,6 +38,8 @@
Put the Debian architecture name in the script at build time instead
of using 'dpkg --print-architecture'. Thanks to Florent Bayle for
the idea. (Closes: #325802, #328088, #339482)
+ * Fix example code showing how to use hooks for malloc. (Closes:
+ bug#333565).
-- Clint Adams <schizo@debian.org> Sun, 12 Feb 2006 11:04:38 -0500
Added: glibc-package/trunk/debian/patches/glibc-manual-memory.diff
===================================================================
--- glibc-package/trunk/debian/patches/glibc-manual-memory.diff 2006-02-17 22:30:20 UTC (rev 1186)
+++ glibc-package/trunk/debian/patches/glibc-manual-memory.diff 2006-02-18 15:42:21 UTC (rev 1187)
@@ -0,0 +1,31 @@
+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.
+
+===================================================================
+RCS file: /cvs/glibc/libc/manual/memory.texi,v
+retrieving revision 1.79
+retrieving revision 1.80
+diff -u -r1.79 -r1.80
+--- libc/manual/memory.texi 2005/01/26 02:39:11 1.79
++++ libc/manual/memory.texi 2005/09/13 17:46:01 1.80
+@@ -948,7 +948,7 @@
+ #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 @@
+ return result;
+ @}
+
+-static void *
++static void
+ my_free_hook (void *ptr, const void *caller)
+ @{
+ /* Restore all old hooks */
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2006-02-17 22:30:20 UTC (rev 1186)
+++ glibc-package/trunk/debian/patches/series 2006-02-18 15:42:21 UTC (rev 1187)
@@ -123,3 +123,4 @@
hppa-pie-relocs.diff -p1
hurd-getresuid-dyslexia.diff -p0
hppa-no-ldbl-128.diff -p1
+glibc-manual-memory.diff -p1
Reply to: