From 63dacdf65acb21fc4034072bda3795ffda13f4ac Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sat, 7 May 2005 17:09:16 +0000 Subject: [PATCH] r6651: It's not the smartest thing in the world to #define _SAMBA_BUILD_ in a file that is only included if _SAMBA_BUILD_ is defined... Let's see how far this gets us. Volker (This used to be commit 563275b35f76107e3d2a8b0b6e14394b20ecd81b) --- source3/configure.in | 1 + source3/include/includes.h | 1 - source3/lib/talloc.c | 8 ++++++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/source3/configure.in b/source3/configure.in index d84c5435974..087c33a7a4e 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 1f2aa8baf91..1fabe44e0e7 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 18fa04034b4..a55300d9922 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 #include -- 2.34.1