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/tdb/common | |
| 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/tdb/common')
| -rw-r--r-- | source4/lib/tdb/common/tdb_private.h | 35 |
1 files changed, 4 insertions, 31 deletions
diff --git a/source4/lib/tdb/common/tdb_private.h b/source4/lib/tdb/common/tdb_private.h index e77b2f2098..cef2ae8a91 100644 --- a/source4/lib/tdb/common/tdb_private.h +++ b/source4/lib/tdb/common/tdb_private.h @@ -24,35 +24,12 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _SAMBA_BUILD_ -#include "config.h" -#include <stdlib.h> -#include <stdio.h> -#ifdef HAVE_STDINT_H -#include <stdint.h> -#endif -#include <fcntl.h> -#include <unistd.h> -#include <string.h> -#include <fcntl.h> -#include <errno.h> -#include <sys/mman.h> -#include <sys/stat.h> -#ifdef HAVE_SYS_SELECT_H -#include <sys/select.h> -#endif -#ifdef HAVE_SYS_TIME_H -#include <sys/time.h> -#endif -#include "tdb.h" - -#else -#include "includes.h" -#include "lib/tdb/include/tdb.h" +#include "replace.h" +#include "system/filesys.h" #include "system/time.h" #include "system/shmem.h" -#include "system/filesys.h" -#endif +#include "system/select.h" +#include "tdb.h" #ifndef u32 #define u32 unsigned @@ -101,10 +78,6 @@ typedef u32 tdb_off_t; #define ACTIVE_LOCK 4 #define TRANSACTION_LOCK 8 -#ifndef MAP_FILE -#define MAP_FILE 0 -#endif - #ifndef MAP_FAILED #define MAP_FAILED ((void *)-1) #endif |