svn commit: samba r6652 - in branches/SAMBA_3_0/source/lib: .

vlendec at samba.org vlendec at samba.org
Sat May 7 19:05:15 GMT 2005


Author: vlendec
Date: 2005-05-07 19:05:15 +0000 (Sat, 07 May 2005)
New Revision: 6652

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

Log:
Next step getting the build farm happy.

Volker

Modified:
   branches/SAMBA_3_0/source/lib/talloctort.c


Changeset:
Modified: branches/SAMBA_3_0/source/lib/talloctort.c
===================================================================
--- branches/SAMBA_3_0/source/lib/talloctort.c	2005-05-07 17:09:16 UTC (rev 6651)
+++ branches/SAMBA_3_0/source/lib/talloctort.c	2005-05-07 19:05:15 UTC (rev 6652)
@@ -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()) {



More information about the samba-cvs mailing list