summaryrefslogtreecommitdiff
path: root/source3/lib
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2005-05-07 21:18:27 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:56:50 -0500
commit7afff6e9ddb746bb0f77755466e63eea6927fbc8 (patch)
tree5f33dbb0c78cb453af08e2ec539442b2bc44946c /source3/lib
parent9f7ded2f5d117d9e36336f9e6bf02580f655c383 (diff)
downloadsamba-7afff6e9ddb746bb0f77755466e63eea6927fbc8.tar.gz
samba-7afff6e9ddb746bb0f77755466e63eea6927fbc8.tar.bz2
samba-7afff6e9ddb746bb0f77755466e63eea6927fbc8.zip
r6654: Make talloc.c 4.0-ready
(This used to be commit be6949362f6be0eb5aa1ddf86061bad2a5674073)
Diffstat (limited to 'source3/lib')
-rw-r--r--source3/lib/talloc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/source3/lib/talloc.c b/source3/lib/talloc.c
index a55300d992..b9a61dd447 100644
--- a/source3/lib/talloc.c
+++ b/source3/lib/talloc.c
@@ -29,6 +29,7 @@
#ifdef _SAMBA_BUILD_
#include "includes.h"
+#if (SAMBA_VERSION_MAJOR<4)
/* This is to circumvent SAMBA3's paranoid malloc checker. Here in this file
* we trust ourselves... */
#ifdef malloc
@@ -37,6 +38,7 @@
#ifdef realloc
#undef realloc
#endif
+#endif
#else
#include <stdio.h>
#include <stdlib.h>