r6807: Fix in-tree build of talloc testsuite

diff --git a/source/lib/talloc/testsuite.c b/source/lib/talloc/testsuite.c
index 0e3d3343160639b96a74993562150d9955541e20..1d5665c338348d37a1a59dcfc10af278d21071d3 100644 (file)
--- a/source/lib/talloc/testsuite.c
+++ b/source/lib/talloc/testsuite.c
@@ -34,13 +34,7 @@
 
 #include "talloc.h"
 
 
 #include "talloc.h"
 

-/* the test suite can be built standalone, or as part of Samba */
-#ifndef _SAMBA_BUILD_

 typedef enum {False=0,True=1} BOOL;
 typedef enum {False=0,True=1} BOOL;

-#endif
-
-/* Samba3 does not define the timeval functions below */
-#if !defined(_SAMBA_BUILD_) || ((SAMBA_VERSION_MAJOR==3)&&(SAMBA_VERSION_MINOR<9))

 
 static struct timeval timeval_current(void)
 {
 
 static struct timeval timeval_current(void)
 {


@@ -55,7 +49,6 @@ static double timeval_elapsed(struct timeval *tv)
        return (tv2.tv_sec - tv->tv_sec) + 
               (tv2.tv_usec - tv->tv_usec)*1.0e-6;
 }
        return (tv2.tv_sec - tv->tv_sec) + 
               (tv2.tv_usec - tv->tv_usec)*1.0e-6;
 }

-#endif /* _SAMBA_BUILD_ */

 
 #if SAMBA_VERSION_MAJOR<4
 #ifdef malloc
 
 #if SAMBA_VERSION_MAJOR<4
 #ifdef malloc