mirror of
https://github.com/samba-team/samba.git
synced 2024-12-27 03:21:53 +03:00
r6808: - test for gcov not needed
- samba malloc wrapper avoidance not needed now we don't use includes.h
- make testsuite work when BOOL, True, False already defined
(This used to be commit c8a274c873
)
This commit is contained in:
parent
5251703764
commit
9e044848e3
@ -7,7 +7,6 @@ if test "x$GCC" = "xyes"; then
|
||||
fi
|
||||
AC_PROG_INSTALL
|
||||
AC_PATH_PROG(XSLTPROC,xsltproc)
|
||||
AC_PATH_PROG(GCOV,gcov)
|
||||
AC_CHECK_HEADERS(stdint.h stdarg.h)
|
||||
AC_CONFIG_HEADER(config.h)
|
||||
sinclude(config.m4)
|
||||
|
@ -27,19 +27,6 @@
|
||||
*/
|
||||
|
||||
|
||||
#ifdef _SAMBA_BUILD_
|
||||
#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
|
||||
#undef malloc
|
||||
#endif
|
||||
#ifdef realloc
|
||||
#undef realloc
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#include <stdio.h>
|
||||
|
@ -34,7 +34,15 @@
|
||||
|
||||
#include "talloc.h"
|
||||
|
||||
typedef enum {False=0,True=1} BOOL;
|
||||
#ifndef False
|
||||
#define False 0
|
||||
#endif
|
||||
#ifndef True
|
||||
#define True 1
|
||||
#endif
|
||||
#ifndef BOOL
|
||||
#define BOOL int
|
||||
#endif
|
||||
|
||||
static struct timeval timeval_current(void)
|
||||
{
|
||||
@ -706,6 +714,7 @@ static BOOL test_steal(void)
|
||||
talloc_free(root);
|
||||
|
||||
p1 = talloc_size(NULL, 3);
|
||||
talloc_report_full(NULL, stdout);
|
||||
CHECK_SIZE(NULL, 3);
|
||||
talloc_free(p1);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user