From bcfa87ef367c5ba68a5007c67b9cde149a945d7e 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

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

(limited to 'source/lib/talloc.c')

diff --git a/source/lib/talloc.c b/source/lib/talloc.c
index a55300d9922..b9a61dd447a 100644
--- a/source/lib/talloc.c
+++ b/source/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