r17952: merge changes from samba3
authorStefan Metzmacher <metze@samba.org>
Thu, 31 Aug 2006 07:43:09 +0000 (07:43 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 19:16:56 +0000 (14:16 -0500)
metze
(This used to be commit ff8d044c2e14e81b4bb32eaacc56875e9602ce4d)

source4/lib/talloc/testsuite.c

index 5f7b68776b91ff2e3cf45c25d7607c5dcf565a0c..013f01cc2cfdf606df224f618767834011c0e7f7 100644 (file)
    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