diff options
Diffstat (limited to 'source3/include/includes.h')
| -rw-r--r-- | source3/include/includes.h | 33 |
1 files changed, 5 insertions, 28 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index 3656a8454e..41f6075a20 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -345,10 +345,6 @@ #include <poll.h> #endif -#ifdef HAVE_EXECINFO_H -#include <execinfo.h> -#endif - #ifdef HAVE_SYS_CAPABILITY_H #if defined(BROKEN_REDHAT_7_SYSTEM_HEADERS) && !defined(_I386_STATFS_H) @@ -437,23 +433,6 @@ #include <com_err.h> #endif -/* 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 - /* memcheck.h includes valgrind.h */ -#include <valgrind/memcheck.h> -#elif HAVE_VALGRIND_H -#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) && (HAVE_VALGRIND_H || HAVE_VALGRIND_VALGRIND_H) -#define VALGRIND -#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 @@ -794,10 +773,6 @@ extern int errno; #include "passdb.h" -#include "sam.h" - -#include "gums.h" - #include "session.h" #include "asn_1.h" @@ -808,8 +783,6 @@ extern int errno; #include "nsswitch/winbind_client.h" -#include "genparser.h" - /* * Type for wide character dirent structure. * Only d_name is defined by POSIX. @@ -847,7 +820,7 @@ struct functable { #define UNI_XDIGIT 0x8 #define UNI_SPACE 0x10 -#include "nsswitch/winbind_nss.h" +#include "nsswitch/nss.h" /* forward declaration from printing.h to get around header file dependencies */ @@ -1235,6 +1208,10 @@ int smb_xvasprintf(char **ptr, const char *format, va_list ap) PRINTF_ATTRIBUTE( time_t timegm(struct tm *tm); #endif +#if defined(VALGRIND) +#define strlen(x) valgrind_strlen(x) +#endif + /* * Veritas File System. Often in addition to native. * Quotas different. |