From 7afff6e9ddb746bb0f77755466e63eea6927fbc8 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Sat, 7 May 2005 21:18:27 +0000
Subject: r6654: Make talloc.c 4.0-ready (This used to be commit
 be6949362f6be0eb5aa1ddf86061bad2a5674073)

---
 source3/lib/talloc.c | 2 ++
 1 file changed, 2 insertions(+)

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>
-- 
cgit