summaryrefslogtreecommitdiff
path: root/source4/lib/talloc
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-05-16 02:38:50 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:16:46 -0500
commit5251703764846f0ed2c06127d67f4b4f65d08945 (patch)
treec64ec4e21ffdae73f9c4bd4713020e8261ef52fd /source4/lib/talloc
parent3a9c42c03310bdf4a23e81a13bf29ec68245b5e2 (diff)
downloadsamba-5251703764846f0ed2c06127d67f4b4f65d08945.tar.gz
samba-5251703764846f0ed2c06127d67f4b4f65d08945.tar.bz2
samba-5251703764846f0ed2c06127d67f4b4f65d08945.zip
r6807: Fix in-tree build of talloc testsuite
(This used to be commit 3541ebe31bef8ccae7a8a1ea4f451ddfbd24460a)
Diffstat (limited to 'source4/lib/talloc')
-rw-r--r--source4/lib/talloc/testsuite.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/source4/lib/talloc/testsuite.c b/source4/lib/talloc/testsuite.c
index 0e3d334316..1d5665c338 100644
--- a/source4/lib/talloc/testsuite.c
+++ b/source4/lib/talloc/testsuite.c
@@ -34,13 +34,7 @@
#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;
-#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)
{
@@ -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;
}
-#endif /* _SAMBA_BUILD_ */
#if SAMBA_VERSION_MAJOR<4
#ifdef malloc