diff options
| -rw-r--r-- | source3/configure.in | 1 | ||||
| -rw-r--r-- | source3/include/includes.h | 1 | ||||
| -rw-r--r-- | source3/lib/talloc.c | 8 |
3 files changed, 9 insertions, 1 deletions
diff --git a/source3/configure.in b/source3/configure.in index d84c543597..087c33a7a4 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -254,6 +254,7 @@ if test "x$CFLAGS" = x; then CFLAGS="-O" fi +CFLAGS="${CFLAGS} -D_SAMBA_BUILD_" AC_ARG_ENABLE(developer, [ --enable-developer Turn on developer warnings and debugging (default=no)], [if eval "test x$enable_developer = xyes"; then diff --git a/source3/include/includes.h b/source3/include/includes.h index 1f2aa8baf9..1fabe44e0e 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -804,7 +804,6 @@ extern int errno; #include "tdb/tdb.h" #include "tdb/spinlock.h" #include "tdb/tdbutil.h" -#define _SAMBA_BUILD_ 1 #include "talloc.h" #include "nt_status.h" #include "ads.h" diff --git a/source3/lib/talloc.c b/source3/lib/talloc.c index 18fa04034b..a55300d992 100644 --- a/source3/lib/talloc.c +++ b/source3/lib/talloc.c @@ -29,6 +29,14 @@ #ifdef _SAMBA_BUILD_ #include "includes.h" +/* This is to circumvent SAMBA3's paranoid malloc checker. Here in this file + * we trust ourselves... */ +#ifdef malloc +#undef malloc +#endif +#ifdef realloc +#undef realloc +#endif #else #include <stdio.h> #include <stdlib.h> |