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

metze at samba.org metze at samba.org
Thu Apr 19 09:08:31 GMT 2007


Author: metze
Date: 2007-04-19 09:08:30 +0000 (Thu, 19 Apr 2007)
New Revision: 22365

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

Log:
prepare merge to 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	2007-04-19 08:50:14 UTC (rev 22364)
+++ branches/SAMBA_4_0/source/lib/talloc/testsuite.c	2007-04-19 09:08:30 UTC (rev 22365)
@@ -1012,7 +1012,7 @@
 
 static bool test_autofree(void)
 {
-#ifndef _SAMBA_BUILD_
+#if _SAMBA_BUILD_ < 4
 	/* autofree test would kill smbtorture */
 	void *p;
 	printf("test: autofree [\nTALLOC AUTOFREE CONTEXT\n]\n");
@@ -1064,7 +1064,7 @@
 	return ret;
 }
 
-#ifndef _SAMBA_BUILD_
+#if _SAMBA_BUILD_ < 4
 int main(void)
 {
 	bool ret = torture_local_talloc(NULL);



More information about the samba-cvs mailing list