Author: jelmer Date: 2005-05-16 02:38:50 +0000 (Mon, 16 May 2005) New Revision: 6807
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6807 Log: Fix in-tree build of talloc testsuite Modified: branches/SAMBA_4_0/source/lib/talloc/testsuite.c Changeset: Modified: branches/SAMBA_4_0/source/lib/talloc/testsuite.c =================================================================== --- branches/SAMBA_4_0/source/lib/talloc/testsuite.c 2005-05-16 02:22:25 UTC (rev 6806) +++ branches/SAMBA_4_0/source/lib/talloc/testsuite.c 2005-05-16 02:38:50 UTC (rev 6807) @@ -34,14 +34,8 @@ #include "talloc.h" -/* the test suite can be built standalone, or as part of Samba */ -#ifndef _SAMBA_BUILD_ 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<9)) - static struct timeval timeval_current(void) { struct timeval tv; @@ -55,7 +49,6 @@ return (tv2.tv_sec - tv->tv_sec) + (tv2.tv_usec - tv->tv_usec)*1.0e-6; } -#endif /* _SAMBA_BUILD_ */ #if SAMBA_VERSION_MAJOR<4 #ifdef malloc
