svn commit: samba r6656 - in branches/SAMBA_3_0/source/lib: .
vlendec at samba.org
vlendec at samba.org
Sat May 7 21:41:53 GMT 2005
Author: vlendec
Date: 2005-05-07 21:41:53 +0000 (Sat, 07 May 2005)
New Revision: 6656
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6656
Log:
Samba 4 is Samba 3.9...
Modified:
branches/SAMBA_3_0/source/lib/talloc.c
branches/SAMBA_3_0/source/lib/talloctort.c
Changeset:
Modified: branches/SAMBA_3_0/source/lib/talloc.c
===================================================================
--- branches/SAMBA_3_0/source/lib/talloc.c 2005-05-07 21:21:29 UTC (rev 6655)
+++ branches/SAMBA_3_0/source/lib/talloc.c 2005-05-07 21:41:53 UTC (rev 6656)
@@ -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
Modified: branches/SAMBA_3_0/source/lib/talloctort.c
===================================================================
--- branches/SAMBA_3_0/source/lib/talloctort.c 2005-05-07 21:21:29 UTC (rev 6655)
+++ branches/SAMBA_3_0/source/lib/talloctort.c 2005-05-07 21:41:53 UTC (rev 6656)
@@ -38,7 +38,7 @@
#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 @@
-#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()) {
More information about the samba-cvs
mailing list