diff options
| author | Andrew Tridgell <tridge@samba.org> | 2006-09-06 04:44:32 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:17:36 -0500 |
| commit | a983b06d37c3b87a02444d9a9862777b88629344 (patch) | |
| tree | 531e396a45b073f476fd091e068c2d6f175a618b /source4/lib/talloc | |
| parent | 3e11f4c06131542565149496d659f0050411a68f (diff) | |
| download | samba-a983b06d37c3b87a02444d9a9862777b88629344.tar.gz samba-a983b06d37c3b87a02444d9a9862777b88629344.tar.bz2 samba-a983b06d37c3b87a02444d9a9862777b88629344.zip | |
r18129: moved the system includes into libreplace - this gives much more
isolation of our portability environment from the main code, and also
simplifies the includes system (no separate #ifdef _SAMBA_BUILD for
tdb. ldb etc now)
(This used to be commit 77d1a468e06290aba789e2f3affc769fc5159a21)
Diffstat (limited to 'source4/lib/talloc')
| -rw-r--r-- | source4/lib/talloc/talloc.c | 17 | ||||
| -rw-r--r-- | source4/lib/talloc/testsuite.c | 14 |
2 files changed, 2 insertions, 29 deletions
diff --git a/source4/lib/talloc/talloc.c b/source4/lib/talloc/talloc.c index f92d76bb3d..d2f7a5d828 100644 --- a/source4/lib/talloc/talloc.c +++ b/source4/lib/talloc/talloc.c @@ -49,23 +49,6 @@ #ifndef _TALLOC_SAMBA3 #include "replace.h" - -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <errno.h> -#ifdef HAVE_STDINT_H -#include <stdint.h> -#endif - -#if defined(HAVE_STDARG_H) -#include <stdarg.h> -#elif defined (HAVE_VARARGS_H) -#include <varargs.h> -#else -#error "no var arg header" -#endif - #include "talloc.h" #endif /* not _TALLOC_SAMBA3 */ diff --git a/source4/lib/talloc/testsuite.c b/source4/lib/talloc/testsuite.c index 766cf039c0..1fa2c7bfe4 100644 --- a/source4/lib/talloc/testsuite.c +++ b/source4/lib/talloc/testsuite.c @@ -28,18 +28,8 @@ #include "version.h" #endif /* _SAMBA_BUILD_ */ -#include "config.h" -#include <stdio.h> -#include <stdlib.h> -#include <string.h> - -#ifdef HAVE_STDARG_H -#include <stdarg.h> -#endif - -#include <sys/time.h> -#include <time.h> - +#include "replace.h" +#include "system/time.h" #include "talloc.h" #ifndef False |