diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-02-12 16:00:46 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-02-12 16:00:46 +0100 |
| commit | 082ba6a1ad3a68aff118d96f855a2aa65eaeb359 (patch) | |
| tree | d70b7e8012e787a11ea1c12224318643cdd552c3 /source3/include/includes.h | |
| parent | 762fdc8c5c2db304f3dc4536c19d69366d1399df (diff) | |
| parent | 4f6d1728254c8503e71c6fdd008fb7264dec26c5 (diff) | |
| download | samba-082ba6a1ad3a68aff118d96f855a2aa65eaeb359.tar.gz samba-082ba6a1ad3a68aff118d96f855a2aa65eaeb359.tar.xz samba-082ba6a1ad3a68aff118d96f855a2aa65eaeb359.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/include/includes.h')
| -rw-r--r-- | source3/include/includes.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index 095fcaa3da..fc77534402 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -241,8 +241,6 @@ typedef int ber_int_t; #include <aio.h> #endif -/* skip valgrind headers on 64bit AMD boxes */ -#ifndef HAVE_64BIT_LINUX /* 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 @@ -251,12 +249,11 @@ typedef int ber_int_t; #elif HAVE_VALGRIND_H #include <valgrind.h> #endif -#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) && !defined(HAVE_64BIT_LINUX) +#if defined(DEVELOPER) #if (HAVE_VALGRIND_H || HAVE_VALGRIND_VALGRIND_H) #define VALGRIND #endif |