sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-07 01:58:28 +03:00
Code

r6656: Samba 4 is Samba 3.9...

Browse Source
This commit is contained in:
Volker Lendecke 2005-05-07 21:41:53 +00:00 committed by Gerald (Jerry) Carter
parent be6949362f
commit 52c73deac7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/lib/talloc.c
View File

@ -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

4
source/lib/talloctort.c
View File

@ -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()) {