summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2005-05-07 19:05:15 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:56:50 -0500
commit9f7ded2f5d117d9e36336f9e6bf02580f655c383 (patch)
tree00451a90b11c5269b1305b4aee6a65dc96eca792 /source3
parent63dacdf65acb21fc4034072bda3795ffda13f4ac (diff)
downloadsamba-9f7ded2f5d117d9e36336f9e6bf02580f655c383.tar.gz
samba-9f7ded2f5d117d9e36336f9e6bf02580f655c383.tar.bz2
samba-9f7ded2f5d117d9e36336f9e6bf02580f655c383.zip
r6652: Next step getting the build farm happy.
Volker (This used to be commit d21514eb7a1ec03c877048e58a54bcbf2cd055f2)
Diffstat (limited to 'source3')
-rw-r--r--source3/lib/talloctort.c14
1 files changed, 13 insertions, 1 deletions
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()) {