r6658: Sorry for the spam... I think now I've got a version that should compile on

trunk, 3_0 and 4_0.

Volker

diff --git a/source/lib/talloc.c b/source/lib/talloc.c
index 532d0fd6c40d34c1a4e01ba62aedc93cc9eaff3b..3650ab7f51b7469aca378a6bf8ebe5b54a776a0d 100644 (file)
--- a/source/lib/talloc.c
+++ b/source/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/source/lib/talloctort.c b/source/lib/talloctort.c
index 1fa9722e10c4790c804fb7b301a3256545523735..0447749abdeca0c6cd9b3e2e77c8689df29c719a 100644 (file)
--- a/source/lib/talloctort.c
+++ b/source/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()) {