diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-08-31 07:43:09 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:16:56 -0500 |
| commit | 930edaaba75fe2112380f027e3f6d5626bea703c (patch) | |
| tree | 58d8f87e0f037b321e9f42dc3f0df8fc739b5ef0 /source4/lib | |
| parent | 4ce057c3f41ce759ab5b197087c5b38b40a1f1d3 (diff) | |
| download | samba-930edaaba75fe2112380f027e3f6d5626bea703c.tar.gz samba-930edaaba75fe2112380f027e3f6d5626bea703c.tar.bz2 samba-930edaaba75fe2112380f027e3f6d5626bea703c.zip | |
r17952: merge changes from samba3
metze
(This used to be commit ff8d044c2e14e81b4bb32eaacc56875e9602ce4d)
Diffstat (limited to 'source4/lib')
| -rw-r--r-- | source4/lib/talloc/testsuite.c | 6 |
1 files changed, 5 insertions, 1 deletions
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 |