sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-29 21:47:30 +03:00
Code

In Valgrind 1.9.4, the headers have moved to <valgrind/valgrind.h>,

Browse Source 
etc.  So check for that as well as the old names when including macros
and conditionally defining -DVALGRIND.
This commit is contained in:
Martin Pool -
parent 1ffa4d75b7
commit c9151c7b11
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/include/includes.h
View File

@ -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