summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2005-05-07 22:09:24 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:56:50 -0500
commit23320ad0e3992b9e25407c1acaf99db4722b916e (patch)
tree025751c7a4ac70ac99325414285dd52ac71470de
parentd6cf9e24647c0a383e85867a21d9c4012ee03ad9 (diff)
downloadsamba-23320ad0e3992b9e25407c1acaf99db4722b916e.tar.gz
samba-23320ad0e3992b9e25407c1acaf99db4722b916e.tar.bz2
samba-23320ad0e3992b9e25407c1acaf99db4722b916e.zip
r6658: Sorry for the spam... I think now I've got a version that should compile on
trunk, 3_0 and 4_0. Volker (This used to be commit 978c7250f7927a805d1ab89f97496aba9ef9e31f)
-rw-r--r--source3/lib/talloc.c2
-rw-r--r--source3/lib/talloctort.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/source3/lib/talloc.c b/source3/lib/talloc.c
index 532d0fd6c4..3650ab7f51 100644
--- a/source3/lib/talloc.c
+++ b/source3/lib/talloc.c
@@ -29,7 +29,7 @@
#ifdef _SAMBA_BUILD_
#include "includes.h"
-#if ((SAMBA_VERSION_MAJOR==3)&&(SAMBA_VERSION_MINOR==0))
+#if ((SAMBA_VERSION_MAJOR==3)&&(SAMBA_VERSION_MINOR<9))
/* This is to circumvent SAMBA3's paranoid malloc checker. Here in this file
* we trust ourselves... */
#ifdef malloc
diff --git a/source3/lib/talloctort.c b/source3/lib/talloctort.c
index 1fa9722e10..0447749abd 100644
--- a/source3/lib/talloctort.c
+++ b/source3/lib/talloctort.c
@@ -38,7 +38,7 @@ 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==0))
+#if !defined(_SAMBA_BUILD_) || ((SAMBA_VERSION_MAJOR==3)&&(SAMBA_VERSION_MINOR<9))
static struct timeval timeval_current(void)
{
@@ -839,7 +839,7 @@ BOOL torture_local_talloc(void)
-#if !defined(_SAMBA_BUILD_) || ((SAMBA_VERSION_MAJOR==3)&&(SAMBA_VERSION_MINOR==0))
+#if !defined(_SAMBA_BUILD_) || ((SAMBA_VERSION_MAJOR==3)&&(SAMBA_VERSION_MINOR<9))
int main(void)
{
if (!torture_local_talloc()) {