summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-05-16 02:45:36 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:16:46 -0500
commit9e044848e394e4395f88b77361e7be06833e3bb8 (patch)
tree8b457b85daf8fa0d115b8372a3e157e5913c3ad3
parent5251703764846f0ed2c06127d67f4b4f65d08945 (diff)
downloadsamba-9e044848e394e4395f88b77361e7be06833e3bb8.tar.gz
samba-9e044848e394e4395f88b77361e7be06833e3bb8.tar.bz2
samba-9e044848e394e4395f88b77361e7be06833e3bb8.zip
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 c8a274c8735957a8a8dd21421abd65a8a1af20f7)
-rw-r--r--source4/lib/talloc/configure.in1
-rw-r--r--source4/lib/talloc/talloc.c13
-rw-r--r--source4/lib/talloc/testsuite.c11
3 files changed, 10 insertions, 15 deletions
diff --git a/source4/lib/talloc/configure.in b/source4/lib/talloc/configure.in
index 436fe365da..8a87ab8754 100644
--- a/source4/lib/talloc/configure.in
+++ b/source4/lib/talloc/configure.in
@@ -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)
diff --git a/source4/lib/talloc/talloc.c b/source4/lib/talloc/talloc.c
index ca2fd9a288..01d1b9f255 100644
--- a/source4/lib/talloc/talloc.c
+++ b/source4/lib/talloc/talloc.c
@@ -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>
diff --git a/source4/lib/talloc/testsuite.c b/source4/lib/talloc/testsuite.c
index 1d5665c338..60da1c3f87 100644
--- a/source4/lib/talloc/testsuite.c
+++ b/source4/lib/talloc/testsuite.c
@@ -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);