svn commit: samba r6655 - in trunk/source/lib: .

[vlendec at samba.org]

Author: vlendec
Date: 2005-05-07 21:21:29 +0000 (Sat, 07 May 2005)
New Revision: 6655

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

Log:
Merge from 3.0
Modified:
   trunk/source/lib/talloc.c
   trunk/source/lib/talloctort.c


Changeset:
Modified: trunk/source/lib/talloc.c
===================================================================
--- trunk/source/lib/talloc.c	2005-05-07 21:18:27 UTC (rev 6654)
+++ trunk/source/lib/talloc.c	2005-05-07 21:21:29 UTC (rev 6655)
@@ -29,6 +29,16 @@
 
 #ifdef _SAMBA_BUILD_
 #include "includes.h"
+#if (SAMBA_VERSION_MAJOR<4)
+/* 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
 #else
 #include <stdio.h>
 #include <stdlib.h>

Modified: trunk/source/lib/talloctort.c
===================================================================
--- trunk/source/lib/talloctort.c	2005-05-07 21:18:27 UTC (rev 6654)
+++ trunk/source/lib/talloctort.c	2005-05-07 21:21:29 UTC (rev 6655)
@@ -35,7 +35,11 @@
 /* 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)
 {
 	struct timeval tv;
@@ -51,6 +55,14 @@
 }
 #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 @@
 
 
 
-#ifndef _SAMBA_BUILD_
+#if !defined(_SAMBA_BUILD_) || (SAMBA_VERSION_MAJOR<4)
  int main(void)
 {
 	if (!torture_local_talloc()) {