RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 19-Jul-2007 08:42:56
Branch: HEAD Handle: 2007071907425600
Modified files:
rpm CHANGES
rpm/rpmio rpmmalloc.c
Log:
Fix building under --with-dmalloc with DMalloc 5.5.2 where
"x{malloc,calloc,realloc,free}" are also overridden.
Summary:
Revision Changes Path
1.1495 +1 -0 rpm/CHANGES
1.13 +7 -0 rpm/rpmio/rpmmalloc.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.1494 -r1.1495 CHANGES
--- rpm/CHANGES 19 Jul 2007 06:39:57 -0000 1.1494
+++ rpm/CHANGES 19 Jul 2007 06:42:56 -0000 1.1495
@@ -1,4 +1,5 @@
4.5 -> 5.0:
+ - rse: fix building under --with-dmalloc with DMalloc 5.5.2 where
"x{malloc,calloc,realloc,free}" are also overridden
- rse: provide convenience --enable-build-debug Autoconf option for
building RPM with debugging instrumentation
- rse: fix memory leak and segfault in lib/psm.c related to dirname(3)
usage
- rse: fix distribution tarball by including the python/ subdir content
as Autoconf unconditionally operates on it
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmmalloc.c
============================================================================
$ cvs diff -u -r1.12 -r1.13 rpmmalloc.c
--- rpm/rpmio/rpmmalloc.c 15 Oct 2001 03:22:55 -0000 1.12
+++ rpm/rpmio/rpmmalloc.c 19 Jul 2007 06:42:56 -0000 1.13
@@ -5,6 +5,13 @@
#include "system.h"
#include "debug.h"
+#if defined(WITH_DMALLOC)
+#undef xmalloc
+#undef xcalloc
+#undef xrealloc
+#undef xstrdup
+#endif
+
#if !defined(EXIT_FAILURE)
#define EXIT_FAILURE 1
#endif
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
