[or-cvs] [tor/master] Fix compilation with --with-dmalloc

[nickm@xxxxxxxxxxxxxx]

Author: Karsten Loesing <karsten.loesing@xxxxxxx>
Date: Mon, 16 Aug 2010 00:00:13 -0400
Subject: Fix compilation with --with-dmalloc
Commit: 15379a7254a5d17ab9a2057435a6daa9c08ae880

Fixes 1832; bugfix on 0.2.2.6-alpha
---
 changes/dmalloc-compile |    4 ++++
 src/or/microdesc.c      |    2 +-
 src/test/test.c         |    1 +
 3 files changed, 6 insertions(+), 1 deletions(-)
 create mode 100644 changes/dmalloc-compile

diff --git a/changes/dmalloc-compile b/changes/dmalloc-compile
new file mode 100644
index 0000000..ee2f11f
--- /dev/null
+++ b/changes/dmalloc-compile
@@ -0,0 +1,4 @@
+  o Minor bugfixes
+    - Fix compilation with --with-dmalloc set.  Bugfix on 0.2.2.6-alpha;
+      fixes bug 1832.
+
diff --git a/src/or/microdesc.c b/src/or/microdesc.c
index f56ccd9..e8f3e7c 100644
--- a/src/or/microdesc.c
+++ b/src/or/microdesc.c
@@ -53,7 +53,7 @@ HT_PROTOTYPE(microdesc_map, microdesc_t, node,
              _microdesc_hash, _microdesc_eq);
 HT_GENERATE(microdesc_map, microdesc_t, node,
              _microdesc_hash, _microdesc_eq, 0.6,
-             _tor_malloc, _tor_realloc, _tor_free);
+             malloc, realloc, free);
 
 /** Write the body of <b>md</b> into <b>f</b>, with appropriate annotations.
  * On success, return the total number of bytes written, and set
diff --git a/src/test/test.c b/src/test/test.c
index 5a37f1d..4a34fd9 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -61,6 +61,7 @@ double fabs(double x);
 #ifdef USE_DMALLOC
 #include <dmalloc.h>
 #include <openssl/crypto.h>
+#include "main.h"
 #endif
 
 /** Set to true if any unit test has failed.  Mostly, this is set by the macros
-- 
1.7.1