svn commit: samba r17952 - in branches/SAMBA_4_0/source/lib/talloc: .

[metze at samba.org]

Author: metze
Date: 2006-08-31 07:43:09 +0000 (Thu, 31 Aug 2006)
New Revision: 17952

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

Log:
merge changes from samba3

metze
Modified:
   branches/SAMBA_4_0/source/lib/talloc/testsuite.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/talloc/testsuite.c
===================================================================
--- branches/SAMBA_4_0/source/lib/talloc/testsuite.c	2006-08-31 07:42:47 UTC (rev 17951)
+++ branches/SAMBA_4_0/source/lib/talloc/testsuite.c	2006-08-31 07:43:09 UTC (rev 17952)
@@ -24,6 +24,10 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
+#ifdef _SAMBA_BUILD_
+#include "version.h"
+#endif /* _SAMBA_BUILD_ */
+
 #include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
@@ -64,7 +68,7 @@
 	       (tv2.tv_usec - tv->tv_usec)*1.0e-6;
 }
 
-#if SAMBA_VERSION_MAJOR<4
+#if SAMBA_VERSION_MAJOR==3
 #ifdef malloc
 #undef malloc
 #endif