diff options
| author | Karsten Loesing <karsten.loesing@gmx.net> | 2010-08-16 00:00:13 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-08-16 00:14:06 -0400 |
| commit | 15379a7254a5d17ab9a2057435a6daa9c08ae880 (patch) | |
| tree | 294987980a8ff2cd2c824ed3b093b27d9c6839f9 | |
| parent | 4c948ffd6c34bc60dc9b3bf66226ae179a2d0752 (diff) | |
| download | tor-15379a7254a5d17ab9a2057435a6daa9c08ae880.tar.gz tor-15379a7254a5d17ab9a2057435a6daa9c08ae880.zip | |
Fix compilation with --with-dmalloc
Fixes 1832; bugfix on 0.2.2.6-alpha
| -rw-r--r-- | changes/dmalloc-compile | 4 | ||||
| -rw-r--r-- | src/or/microdesc.c | 2 | ||||
| -rw-r--r-- | src/test/test.c | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/changes/dmalloc-compile b/changes/dmalloc-compile new file mode 100644 index 0000000000..ee2f11fa87 --- /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 f56ccd9ee2..e8f3e7c59f 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 5a37f1da8d..4a34fd9ac4 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 |