mirror of
https://github.com/samba-team/samba.git
synced 2025-02-03 13:47:25 +03:00
r6652: Next step getting the build farm happy.
Volker (This used to be commit d21514eb7a1ec03c877048e58a54bcbf2cd055f2)
This commit is contained in:
parent
63dacdf65a
commit
9f7ded2f5d
@ -35,6 +35,10 @@
|
||||
/* 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<4)
|
||||
|
||||
static struct timeval timeval_current(void)
|
||||
{
|
||||
@ -51,6 +55,14 @@ static double timeval_elapsed(struct timeval *tv)
|
||||
}
|
||||
#endif /* _SAMBA_BUILD_ */
|
||||
|
||||
#if SAMBA_VERSION_MAJOR<4
|
||||
#ifdef malloc
|
||||
#undef malloc
|
||||
#endif
|
||||
#ifdef strdup
|
||||
#undef strdup
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#define CHECK_SIZE(ptr, tsize) do { \
|
||||
if (talloc_total_size(ptr) != (tsize)) { \
|
||||
@ -827,7 +839,7 @@ BOOL torture_local_talloc(void)
|
||||
|
||||
|
||||
|
||||
#ifndef _SAMBA_BUILD_
|
||||
#if !defined(_SAMBA_BUILD_) || (SAMBA_VERSION_MAJOR<4)
|
||||
int main(void)
|
||||
{
|
||||
if (!torture_local_talloc()) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user