svn commit: samba r6654 - in branches/SAMBA_3_0/source/lib: .

[vlendec at samba.org]

Author: vlendec
Date: 2005-05-07 21:18:27 +0000 (Sat, 07 May 2005)
New Revision: 6654

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6654

Log:
Make talloc.c 4.0-ready
Modified:
   branches/SAMBA_3_0/source/lib/talloc.c


Changeset:
Modified: branches/SAMBA_3_0/source/lib/talloc.c
===================================================================
--- branches/SAMBA_3_0/source/lib/talloc.c	2005-05-07 21:15:39 UTC (rev 6653)
+++ branches/SAMBA_3_0/source/lib/talloc.c	2005-05-07 21:18:27 UTC (rev 6654)
@@ -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>