diff options
| author | Volker Lendecke <vlendec@samba.org> | 2005-05-07 21:41:53 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:56:50 -0500 |
| commit | d6cf9e24647c0a383e85867a21d9c4012ee03ad9 (patch) | |
| tree | 59e24a731862aaf6d1809dbda03b856f358a2b93 /source3 | |
| parent | 7afff6e9ddb746bb0f77755466e63eea6927fbc8 (diff) | |
| download | samba-d6cf9e24647c0a383e85867a21d9c4012ee03ad9.tar.gz samba-d6cf9e24647c0a383e85867a21d9c4012ee03ad9.tar.bz2 samba-d6cf9e24647c0a383e85867a21d9c4012ee03ad9.zip | |
r6656: Samba 4 is Samba 3.9...
(This used to be commit 52c73deac72fd88c83ac53481e56f6a04d6def69)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/lib/talloc.c | 2 | ||||
| -rw-r--r-- | source3/lib/talloctort.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source3/lib/talloc.c b/source3/lib/talloc.c index b9a61dd447..532d0fd6c4 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<4) +#if ((SAMBA_VERSION_MAJOR==3)&&(SAMBA_VERSION_MINOR==0)) /* 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 7ff8b0321d..1fa9722e10 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<4) +#if !defined(_SAMBA_BUILD_) || ((SAMBA_VERSION_MAJOR==3)&&(SAMBA_VERSION_MINOR==0)) static struct timeval timeval_current(void) { @@ -839,7 +839,7 @@ BOOL torture_local_talloc(void) -#if !defined(_SAMBA_BUILD_) || (SAMBA_VERSION_MAJOR<4) +#if !defined(_SAMBA_BUILD_) || ((SAMBA_VERSION_MAJOR==3)&&(SAMBA_VERSION_MINOR==0)) int main(void) { if (!torture_local_talloc()) { |