summaryrefslogtreecommitdiff
path: root/source3/lib/talloc.c
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2005-05-07 17:09:16 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:56:49 -0500
commit63dacdf65acb21fc4034072bda3795ffda13f4ac (patch)
tree3366ddd0bf0ab975d58ac869ba55b298b480f534 /source3/lib/talloc.c
parent479fe39c177b8c64dbf253b06eb991f03503ec3d (diff)
downloadsamba-63dacdf65acb21fc4034072bda3795ffda13f4ac.tar.gz
samba-63dacdf65acb21fc4034072bda3795ffda13f4ac.tar.bz2
samba-63dacdf65acb21fc4034072bda3795ffda13f4ac.zip
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)
Diffstat (limited to 'source3/lib/talloc.c')
-rw-r--r--source3/lib/talloc.c8
1 files changed, 8 insertions, 0 deletions
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>