From 281677084e022336877dd141befd508a0b5c08a9 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 2 Oct 2006 10:37:17 +0000
Subject: [PATCH] r19034: merge from samba4:

prepare libreplace testsuite for usage in smbtorture

metze
---
 source/lib/replace/test/testsuite.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/source/lib/replace/test/testsuite.c b/source/lib/replace/test/testsuite.c
index 6644fce6bd4..fa5265f66f0 100644
--- a/source/lib/replace/test/testsuite.c
+++ b/source/lib/replace/test/testsuite.c
@@ -89,7 +89,7 @@ static int test_strlcpy(void)
 	char buf[4];
 	const struct {
 		const char *src;
-		int result;
+		size_t result;
 	} tests[] = {
 		{ "abc", 3 },
 		{ "abcdef", 6 },
@@ -373,9 +373,11 @@ static int test_MAX(void)
 	return true;
 }
 
-int torture_local_replace(void *ctx)
+struct torture_context;
+
+bool torture_local_replace(struct torture_context *torture)
 {
-	int ret = true;
+	bool ret = true;
 	ret &= test_ftruncate();
 	ret &= test_strlcpy();
 	ret &= test_strlcat();
@@ -423,7 +425,7 @@ int torture_local_replace(void *ctx)
 	return ret;
 }
 
-#if !defined(_SAMBA_BUILD_) || ((SAMBA_VERSION_MAJOR==3)&&(SAMBA_VERSION_MINOR<9))
+#if _SAMBA_BUILD_<4
 int main(void)
 {
 	if (!torture_local_replace(NULL)) {