diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-05-16 01:57:27 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:16:45 -0500 |
| commit | 1f474c2692af8ba704a4071fe6e496cb43e19bae (patch) | |
| tree | 65cfe9a075899f7ba50712aa9de31eb4fc125e36 /source4/lib/talloc/talloc.c | |
| parent | 1d0e2b9569be6f2e8a5495ead1f92c9855f0e7f9 (diff) | |
| download | samba-1f474c2692af8ba704a4071fe6e496cb43e19bae.tar.gz samba-1f474c2692af8ba704a4071fe6e496cb43e19bae.tar.bz2 samba-1f474c2692af8ba704a4071fe6e496cb43e19bae.zip | |
r6804: Add config.h for talloc (and use it)
(This used to be commit c2ce09d38003fd43212de9cd08e4a781cc2aff88)
Diffstat (limited to 'source4/lib/talloc/talloc.c')
| -rw-r--r-- | source4/lib/talloc/talloc.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/source4/lib/talloc/talloc.c b/source4/lib/talloc/talloc.c index 46abd89bac..ca2fd9a288 100644 --- a/source4/lib/talloc/talloc.c +++ b/source4/lib/talloc/talloc.c @@ -28,7 +28,6 @@ #ifdef _SAMBA_BUILD_ -#include "includes.h" #if ((SAMBA_VERSION_MAJOR==3)&&(SAMBA_VERSION_MINOR<9)) /* This is to circumvent SAMBA3's paranoid malloc checker. Here in this file * we trust ourselves... */ @@ -39,17 +38,26 @@ #undef realloc #endif #endif -#else +#endif + +#include "config.h" + #include <stdio.h> #include <stdlib.h> #include <string.h> + +#ifdef HAVE_STDARG_H #include <stdarg.h> +#else +#include <varargs.h> +#endif + +#ifdef HAVE_STDINT_H #include <stdint.h> -#include "talloc.h" -/* assume a modern system */ -#define HAVE_VA_COPY #endif +#include "talloc.h" + /* use this to force every realloc to change the pointer, to stress test code that might not cope */ #define ALWAYS_REALLOC 0 |