svn commit: samba r6659 - in trunk/source/lib: .
vlendec at samba.org
vlendec at samba.org
Sat May 7 22:09:44 GMT 2005
Author: vlendec
Date: 2005-05-07 22:09:42 +0000 (Sat, 07 May 2005)
New Revision: 6659
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6659
Log:
Sorry for the spam... I think now I've got a version that should compile on
trunk, 3_0 and 4_0.
Volker
Modified:
trunk/source/lib/talloc.c
trunk/source/lib/talloctort.c
Changeset:
Modified: trunk/source/lib/talloc.c
===================================================================
--- trunk/source/lib/talloc.c 2005-05-07 22:09:24 UTC (rev 6658)
+++ trunk/source/lib/talloc.c 2005-05-07 22:09:42 UTC (rev 6659)
@@ -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
Modified: trunk/source/lib/talloctort.c
===================================================================
--- trunk/source/lib/talloctort.c 2005-05-07 22:09:24 UTC (rev 6658)
+++ trunk/source/lib/talloctort.c 2005-05-07 22:09:42 UTC (rev 6659)
@@ -38,7 +38,7 @@
#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 @@
-#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()) {
More information about the samba-cvs
mailing list