diff options
Diffstat (limited to 'source4/lib/talloc/talloc.c')
| -rw-r--r-- | source4/lib/talloc/talloc.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/source4/lib/talloc/talloc.c b/source4/lib/talloc/talloc.c index cb5e91341e..3650ab7f51 100644 --- a/source4/lib/talloc/talloc.c +++ b/source4/lib/talloc/talloc.c @@ -29,6 +29,16 @@ #ifdef _SAMBA_BUILD_ #include "includes.h" +#if ((SAMBA_VERSION_MAJOR==3)&&(SAMBA_VERSION_MINOR<9)) +/* 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 +#endif #else #include <stdio.h> #include <stdlib.h> @@ -1081,7 +1091,6 @@ void *talloc_autofree_context(void) return cleanup_context; } - size_t talloc_get_size(const void *context) { struct talloc_chunk *tc; |