svn commit: samba r6808 - in branches/SAMBA_4_0/source/lib/talloc: .

tridge at samba.org tridge at samba.org
Mon May 16 02:45:36 GMT 2005


Author: tridge
Date: 2005-05-16 02:45:36 +0000 (Mon, 16 May 2005)
New Revision: 6808

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6808

Log:
- 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

Modified:
   branches/SAMBA_4_0/source/lib/talloc/configure.in
   branches/SAMBA_4_0/source/lib/talloc/talloc.c
   branches/SAMBA_4_0/source/lib/talloc/testsuite.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/talloc/configure.in
===================================================================
--- branches/SAMBA_4_0/source/lib/talloc/configure.in	2005-05-16 02:38:50 UTC (rev 6807)
+++ branches/SAMBA_4_0/source/lib/talloc/configure.in	2005-05-16 02:45:36 UTC (rev 6808)
@@ -7,7 +7,6 @@
 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)

Modified: branches/SAMBA_4_0/source/lib/talloc/talloc.c
===================================================================
--- branches/SAMBA_4_0/source/lib/talloc/talloc.c	2005-05-16 02:38:50 UTC (rev 6807)
+++ branches/SAMBA_4_0/source/lib/talloc/talloc.c	2005-05-16 02:45:36 UTC (rev 6808)
@@ -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>

Modified: branches/SAMBA_4_0/source/lib/talloc/testsuite.c
===================================================================
--- branches/SAMBA_4_0/source/lib/talloc/testsuite.c	2005-05-16 02:38:50 UTC (rev 6807)
+++ branches/SAMBA_4_0/source/lib/talloc/testsuite.c	2005-05-16 02:45:36 UTC (rev 6808)
@@ -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 @@
 	talloc_free(root);
 
 	p1 = talloc_size(NULL, 3);
+	talloc_report_full(NULL, stdout);
 	CHECK_SIZE(NULL, 3);
 	talloc_free(p1);
 



More information about the samba-cvs mailing list