summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-04-19 09:08:30 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:51:07 -0500
commit361e0b0bd7af14ca8e9c7fb442c90029e07b9ea2 (patch)
tree31fc4ebae1719f4ca068f428695ff4c9dae62cfc /source4
parent558e5ddc528a63580ebde48aec224c9fc7d1c07e (diff)
downloadsamba-361e0b0bd7af14ca8e9c7fb442c90029e07b9ea2.tar.gz
samba-361e0b0bd7af14ca8e9c7fb442c90029e07b9ea2.tar.bz2
samba-361e0b0bd7af14ca8e9c7fb442c90029e07b9ea2.zip
r22365: prepare merge to samba3
metze (This used to be commit 6780c234275b29192c49bf6d45204b0ac458faaf)
Diffstat (limited to 'source4')
-rw-r--r--source4/lib/talloc/testsuite.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/lib/talloc/testsuite.c b/source4/lib/talloc/testsuite.c
index 88ed638252..d122a5de0d 100644
--- a/source4/lib/talloc/testsuite.c
+++ b/source4/lib/talloc/testsuite.c
@@ -1012,7 +1012,7 @@ static bool test_talloc_ptrtype(void)
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 @@ bool torture_local_talloc(struct torture_context *tctx)
return ret;
}
-#ifndef _SAMBA_BUILD_
+#if _SAMBA_BUILD_ < 4
int main(void)
{
bool ret = torture_local_talloc(NULL);