From 197f98aededbb456951be2d0d7f8ac587006a60d Mon Sep 17 00:00:00 2001 From: Martin Pool Date: Thu, 13 Mar 2003 06:18:18 +0000 Subject: In Valgrind 1.9.4, the headers have moved to , etc. So check for that as well as the old names when including macros and conditionally defining -DVALGRIND. (This used to be commit c9151c7b1113e2f01bd33d4dd301a2e7e2040b35) --- source3/include/includes.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'source3') diff --git a/source3/include/includes.h b/source3/include/includes.h index b6abdd99ce..25245e9c0c 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -433,15 +433,19 @@ #include #endif -#if HAVE_VALGRIND_H -/* Special macros that are no-ops except when run under Valgrind on x86. */ +/* Special macros that are no-ops except when run under Valgrind on + * x86. They've moved a little bit from valgrind 1.0.4 to 1.9.4 */ +#if HAVE_VALGRIND_MEMCHECK_H + /* memcheck.h includes valgrind.h */ +#include +#elif HAVE_VALGRIND_H #include #endif /* If we have --enable-developer and the valgrind header is present, * then we're OK to use it. Set a macro so this logic can be done only * once. */ -#if defined(DEVELOPER) && HAVE_VALGRIND_H +#if defined(DEVELOPER) && (HAVE_VALGRIND_H || HAVE_VALGRIND_VALGRIND_H) #define VALGRIND #endif -- cgit