[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  48dccbf s3: Move #define VALGRIND to config.h
      from  d05ae94 s4:rpc_server/echo: fix compiler warning

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 48dccbf2b52163643b5bbc0d73b65e12b8c92c12
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Oct 3 11:56:35 2010 +0200

    s3: Move #define VALGRIND to config.h
    
    This fixes the valgrind overrun in the tdb jenkins hash

-----------------------------------------------------------------------

Summary of changes:
 source3/configure.in       |    7 +++++++
 source3/include/includes.h |   10 ----------
 2 files changed, 7 insertions(+), 10 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/configure.in b/source3/configure.in
index 630c854..2db1b39 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -759,6 +759,13 @@ CPPFLAGS="$old_CPPFLAGS"
 # subdirectory of headers.
 AC_CHECK_HEADERS(valgrind.h valgrind/valgrind.h valgrind/memcheck.h)
 
+if test x"$enable_developer" = x"yes" ; then
+   if test x"$ac_cv_header_valgrind_h" = xyes -o \
+           x"$ac_cv_header_valgrind_valgrind_h" = xyes ; then
+      AC_DEFINE(VALGRIND,1,[Whether we have valgrind headers])
+   fi
+fi
+
 #
 # 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 a17e014..11066e2 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -251,16 +251,6 @@ typedef int ber_int_t;
 #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)
-#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 */
 #if defined(WITH_ADS) && defined(HAVE_KRB5) && defined(HAVE_LDAP)
 #define HAVE_ADS


-- 
Samba Shared Repository