sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-11-16 20:23:50 +03:00
Code Activity

r17952: merge changes from samba3

Browse Source 
metze
This commit is contained in:
Stefan Metzmacher
2006-08-31 07:43:09 +00:00
committed by Gerald (Jerry) Carter
parent 5697841e29
commit ff8d044c2e
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/lib/talloc/testsuite.c
View File

@@ -24,6 +24,10 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifdef _SAMBA_BUILD_
#include "version.h"
#endif /* _SAMBA_BUILD_ */
#include "config.h"
#include <stdio.h>
#include <stdlib.h>
@@ -64,7 +68,7 @@ static double timeval_elapsed(struct timeval *tv)
(tv2.tv_usec - tv->tv_usec)*1.0e-6;
}
#if SAMBA_VERSION_MAJOR<4
#if SAMBA_VERSION_MAJOR==3
#ifdef malloc
#undef malloc
#endif