Automated merge.

diff --git a/src/ChangeLog b/src/ChangeLog
index 28ce4499e5d457896531edc91358baca8dc29a48..5e3a88938143b925feabfec5c2956796f3ada430 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-08-08  Steven Schubiger  <stsc@members.fsf.org>
+
+       * main.c, utils.h: Removed some dead conditional DEBUG_MALLOC code.
+
 2008-08-03  Micah Cowan  <micah@cowan.name>
 
        * main.c (print_help): Added --default-page.

diff --git a/src/main.c b/src/main.c
index 7c7be1c740484192bac7235d113ed5c2f06d1c6d..c080394e16e62345f82be82f594a8659373a0ce5 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1273,9 +1273,6 @@ WARNING: Can't reopen standard output in binary mode;\n\
     xfree (url[i]);
   cleanup ();
 
-#ifdef DEBUG_MALLOC
-  print_malloc_debug_stats ();
-#endif
   if (status == RETROK)
     return 0;
   else

diff --git a/src/utils.h b/src/utils.h
index d3ae9b33f11c75a61dfeb3de1cf8686a3bfb0f9c..becdc92427379d29348ec92da443ac6cdd068d1c 100644 (file)
--- a/src/utils.h
+++ b/src/utils.h
@@ -66,10 +66,6 @@ struct file_memory {
 char *time_str (time_t);
 char *datetime_str (time_t);
 
-#ifdef DEBUG_MALLOC
-void print_malloc_debug_stats ();
-#endif
-
 char *xstrdup_lower (const char *);
 
 char *strdupdelim (const char *, const char *);