summaryrefslogtreecommitdiff
path: root/source3/include/includes.h
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2005-07-15 21:36:00 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:00:07 -0500
commitf5bf5765af07f04ff6fcf5615c2e09fc468aff5f (patch)
tree4127933d7cede9ce74ea2965fe9085a1df0c273e /source3/include/includes.h
parent787e526652b2f754ca9441a6fdf8e0745ac4d54a (diff)
downloadsamba-f5bf5765af07f04ff6fcf5615c2e09fc468aff5f.tar.gz
samba-f5bf5765af07f04ff6fcf5615c2e09fc468aff5f.tar.bz2
samba-f5bf5765af07f04ff6fcf5615c2e09fc468aff5f.zip
r8510: Don't include the valgrind headers on 64bit linux systems.
Several incarnations of gcc bork with Compiling dynconfig.c /tmp/ccXd94O5.s: Assembler messages: /tmp/ccXd94O5.s:1202: Error: suffix or operands invalid for `mov' /tmp/ccXd94O5.s:1289: Error: suffix or operands invalid for `mov'` Thanks to Bent Vangli for the the leg work and suggestions. (This used to be commit 318fe7ba0093c4a94e9f4f5c8ce7a2f5d1078e26)
Diffstat (limited to 'source3/include/includes.h')
-rw-r--r--source3/include/includes.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index c091506381..6cab2525b0 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -507,6 +507,8 @@
#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
@@ -515,6 +517,7 @@
#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