From 9f7ded2f5d117d9e36336f9e6bf02580f655c383 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Sat, 7 May 2005 19:05:15 +0000
Subject: r6652: Next step getting the build farm happy.

Volker
(This used to be commit d21514eb7a1ec03c877048e58a54bcbf2cd055f2)
---
 source3/lib/talloctort.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/source3/lib/talloctort.c b/source3/lib/talloctort.c
index 967874917d..7ff8b0321d 100644
--- a/source3/lib/talloctort.c
+++ b/source3/lib/talloctort.c
@@ -35,6 +35,10 @@
 /* the test suite can be built standalone, or as part of Samba */
 #ifndef _SAMBA_BUILD_
 typedef enum {False=0,True=1} BOOL;
+#endif
+
+/* Samba3 does not define the timeval functions below */
+#if !defined(_SAMBA_BUILD_) || (SAMBA_VERSION_MAJOR<4)
 
 static struct timeval timeval_current(void)
 {
@@ -51,6 +55,14 @@ static double timeval_elapsed(struct timeval *tv)
 }
 #endif /* _SAMBA_BUILD_ */
 
+#if SAMBA_VERSION_MAJOR<4
+#ifdef malloc
+#undef malloc
+#endif
+#ifdef strdup
+#undef strdup
+#endif
+#endif
 
 #define CHECK_SIZE(ptr, tsize) do { \
 	if (talloc_total_size(ptr) != (tsize)) { \
@@ -827,7 +839,7 @@ BOOL torture_local_talloc(void)
 
 
 
-#ifndef _SAMBA_BUILD_
+#if !defined(_SAMBA_BUILD_) || (SAMBA_VERSION_MAJOR<4)
  int main(void)
 {
 	if (!torture_local_talloc()) {
-- 
cgit