summaryrefslogtreecommitdiff
path: root/lib/talloc
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2011-04-04 16:28:31 +0200
committerStefan Metzmacher <metze@samba.org>2011-04-08 09:28:10 +0200
commit2146ffd764499d67e3f0576a2e78a1575cd52d9c (patch)
tree9a5ac1f655be31685423b7b2e44e18031e169609 /lib/talloc
parent73cc85ac903387f2c7f8ef2d948b40b57887cf17 (diff)
downloadsamba-2146ffd764499d67e3f0576a2e78a1575cd52d9c.tar.gz
samba-2146ffd764499d67e3f0576a2e78a1575cd52d9c.tar.bz2
samba-2146ffd764499d67e3f0576a2e78a1575cd52d9c.zip
talloc: include valgrind headers if available
metze Signed-off-By: Andrew Tridgell <tridge@samba.org>
Diffstat (limited to 'lib/talloc')
-rw-r--r--lib/talloc/talloc.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/talloc/talloc.c b/lib/talloc/talloc.c
index b640159c19..6f952dcdff 100644
--- a/lib/talloc/talloc.c
+++ b/lib/talloc/talloc.c
@@ -45,6 +45,15 @@
#endif
#endif
+/* 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 */
+#ifdef HAVE_VALGRIND_MEMCHECK_H
+ /* memcheck.h includes valgrind.h */
+#include <valgrind/memcheck.h>
+#elif defined(HAVE_VALGRIND_H)
+#include <valgrind.h>
+#endif
+
/* use this to force every realloc to change the pointer, to stress test
code that might not cope */
#define ALWAYS_REALLOC 0