From fa2c3a73e4dbbe69c311d6a2ded4e5cc0d6be665 Mon Sep 17 00:00:00 2001
From: Roger Dingledine <arma@torproject.org>
Date: Fri, 30 Nov 2007 19:02:56 +0000
Subject: make dmalloc 5.4.2 work again too

svn:r12615
---
 src/common/util.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'src/common')

diff --git a/src/common/util.c b/src/common/util.c
index 03670c503b..ffbd0e6c0b 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -79,8 +79,17 @@ const char util_c_id[] = "$Id$";
  #undef strndup
  #include <dmalloc.h>
  #define DMALLOC_FN_ARGS , file, line
- #define dmalloc_strdup(file, line, string, xalloc_b) dmalloc_strndup(file, line, (string), -1, xalloc_b)
-#else
+
+ #if defined(HAVE_DMALLOC_STRDUP)
+ /* the dmalloc_strdup should be fine as defined */
+ #elif defined(HAVE_DMALLOC_STRNDUP)
+ #define dmalloc_strdup(file, line, string, xalloc_b) \
+         dmalloc_strndup(file, line, (string), -1, xalloc_b)
+ #else
+ #error "No dmalloc_strdup or equivalent"
+ #endif
+
+#else /* not using dmalloc */
  #define dmalloc_strdup(file, line, string, xalloc_b) strdup(string)
 
  #define dmalloc_malloc(file, line, size, func_id, alignment, xalloc_b) \
-- 
cgit v1.2.3-54-g00ecf