summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorBjörn Jacke <bj@sernet.de>2009-02-12 12:29:35 +0100
committerVolker Lendecke <vl@samba.org>2009-02-12 13:00:44 +0100
commitaff48fba1825b2838818ab2f1d037fae32ae132a (patch)
tree3f89d1d8ee8e4ac2507d635ee1b65f64dfc3644e /source3
parentd8c54fddda2dba3cbc5fc13e93431b152813892e (diff)
downloadsamba-aff48fba1825b2838818ab2f1d037fae32ae132a.tar.gz
samba-aff48fba1825b2838818ab2f1d037fae32ae132a.tar.bz2
samba-aff48fba1825b2838818ab2f1d037fae32ae132a.zip
today valgrind is available on 64bit Linux, too
Diffstat (limited to 'source3')
-rw-r--r--source3/configure.in12
-rw-r--r--source3/include/includes.h5
2 files changed, 1 insertions, 16 deletions
diff --git a/source3/configure.in b/source3/configure.in
index 10ce6f6e5e..8e49074533 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -703,18 +703,6 @@ CPPFLAGS="$old_CPPFLAGS"
# subdirectory of headers.
AC_CHECK_HEADERS(valgrind.h valgrind/valgrind.h valgrind/memcheck.h)
-# check for linux on amd64 since valgrind is not quite there yet
-case "$host_os" in
- *linux*)
- case "$UNAME_P" in
- *x86_64*)
- AC_DEFINE(HAVE_64BIT_LINUX,1,[Whether we are running on 64bit linux])
- ;;
- esac
- ;;
-esac
-
-
#
# HPUX has a bug in that including shadow.h causes a re-definition of MAXINT.
# This causes configure to fail to detect it. Check for shadow separately on HPUX.
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