diff options
| author | Martin Pool <mbp@samba.org> | 2003-03-13 06:18:18 +0000 |
|---|---|---|
| committer | Martin Pool <mbp@samba.org> | 2003-03-13 06:18:18 +0000 |
| commit | c9151c7b1113e2f01bd33d4dd301a2e7e2040b35 (patch) | |
| tree | 7e303fcbc2f2d39818ea6eb96cf95dd8486b4ec1 | |
| parent | 1ffa4d75b75979b8abb409634212ce43a0826467 (diff) | |
| download | samba-c9151c7b1113e2f01bd33d4dd301a2e7e2040b35.tar.gz samba-c9151c7b1113e2f01bd33d4dd301a2e7e2040b35.tar.xz samba-c9151c7b1113e2f01bd33d4dd301a2e7e2040b35.zip | |
In Valgrind 1.9.4, the headers have moved to <valgrind/valgrind.h>,
etc. So check for that as well as the old names when including macros
and conditionally defining -DVALGRIND.
| -rw-r--r-- | source/include/includes.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/source/include/includes.h b/source/include/includes.h index b6abdd99ce7..25245e9c0cd 100644 --- a/source/include/includes.h +++ b/source/include/includes.h @@ -433,15 +433,19 @@ #include <com_err.h> #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 <valgrind/memcheck.h> +#elif HAVE_VALGRIND_H #include <valgrind.h> #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 |