svn commit: samba r13365 - in trunk/source/include: .

[jpeach at samba.org]

Author: jpeach
Date: 2006-02-06 06:23:58 +0000 (Mon, 06 Feb 2006)
New Revision: 13365

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13365

Log:
svn merge -r 13363:13364 ../branches/SAMBA_3_0

Modified:
   trunk/source/include/includes.h


Changeset:
Modified: trunk/source/include/includes.h
===================================================================
--- trunk/source/include/includes.h	2006-02-06 06:22:20 UTC (rev 13364)
+++ trunk/source/include/includes.h	2006-02-06 06:23:58 UTC (rev 13365)
@@ -533,9 +533,11 @@
 /* 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 || HAVE_VALGRIND_VALGRIND_H)
+#if defined(DEVELOPER) && !defined(HAVE_64BIT_LINUX)
+#if (HAVE_VALGRIND_H || HAVE_VALGRIND_VALGRIND_H)
 #define VALGRIND
 #endif
+#endif
 
 
 /* we support ADS if we want it and have krb5 and ldap libs */