[svn] Fix build problems with DEBUG_MALLOC.

diff --git a/src/ChangeLog b/src/ChangeLog
index a3ca569248a4f89c6f29bcea4ed86e6083a5e26a..0b36ed453acc37862b33f3775a02680c1ffdccda 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2007-02-02  Hrvoje Niksic  <hniksic@xemacs.org>
+
+       * netrc.c: Don't make netrc_list static, as it prevents
+       compilation with DEBUG_MALLOC.
+
+       * utils.c (aprintf): Don't use vasprintf when DEBUG_MALLOC is
+       requested because, in that case, we want the calls to malloc to be
+       coming from us.
+
 2007-01-23  Hrvoje Niksic  <hniksic@xemacs.org>
 
        * cookies.c (parse_set_cookie): Would erroneously discard cookies

diff --git a/src/netrc.c b/src/netrc.c
index 48ac0c76c161dd00bf6994993c71061ee7c09ce5..dabcf922d131a4ff974fed65198c7c90557564a5 100644 (file)
--- a/src/netrc.c
+++ b/src/netrc.c
@@ -46,7 +46,7 @@ so, delete this exception statement from your version.  */
 
 #define NETRC_FILE_NAME ".netrc"
 
-static acc_t *netrc_list;
+acc_t *netrc_list;
 
 static acc_t *parse_netrc (const char *);
 

diff --git a/src/utils.c b/src/utils.c
index 7a90c0692dfe6a569e1e53bafd6e92de23d91d36..60b040b88d401befad2c01eb7e0ef52bef6124d9 100644 (file)
--- a/src/utils.c
+++ b/src/utils.c
@@ -159,7 +159,7 @@ sepstring (const char *s)
 char *
 aprintf (const char *fmt, ...)
 {
-#ifdef HAVE_VASPRINTF
+#if defined HAVE_VASPRINTF && !defined DEBUG_MALLOC
   /* Use vasprintf. */
   int ret;
   va_list args;