From 930edaaba75fe2112380f027e3f6d5626bea703c Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 31 Aug 2006 07:43:09 +0000
Subject: r17952: merge changes from samba3

metze
(This used to be commit ff8d044c2e14e81b4bb32eaacc56875e9602ce4d)
---
 source4/lib/talloc/testsuite.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'source4/lib')

diff --git a/source4/lib/talloc/testsuite.c b/source4/lib/talloc/testsuite.c
index 5f7b68776b..013f01cc2c 100644
--- a/source4/lib/talloc/testsuite.c
+++ b/source4/lib/talloc/testsuite.c
@@ -24,6 +24,10 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
+#ifdef _SAMBA_BUILD_
+#include "version.h"
+#endif /* _SAMBA_BUILD_ */
+
 #include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
@@ -64,7 +68,7 @@ static double timeval_elapsed(struct timeval *tv)
 	       (tv2.tv_usec - tv->tv_usec)*1.0e-6;
 }
 
-#if SAMBA_VERSION_MAJOR<4
+#if SAMBA_VERSION_MAJOR==3
 #ifdef malloc
 #undef malloc
 #endif
-- 
cgit