Commit fa2c3a73 authored by Roger Dingledine's avatar Roger Dingledine
Browse files

make dmalloc 5.4.2 work again too 


svn:r12615
parent ad0fcef5

configure.in

+1 −0
Changes for configure.in: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -500,6 +500,7 @@ if [[ $dmalloc -eq 1 ]]; then 
  AC_SEARCH_LIBS(dmalloc_malloc, [dmallocth dmalloc], , AC_MSG_ERROR(Libdmalloc library not found. If you enable it you better have it installed.))

  AC_DEFINE(USE_DMALLOC, 1, [Debug memory allocation library])

  AC_DEFINE(DMALLOC_FUNC_CHECK, 1, [Enable dmalloc's malloc function check])

  AC_CHECK_FUNCS(dmalloc_strdup dmalloc_strndup)

fi



# Allow user to specify an alternate syslog facility

src/common/util.c

+10 −1
Changes for src/common/util.c: 10 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -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)



 #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) \