1
0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00

tdb2: minor changes to SAMBIFY it.

This is a bit messy, but it works.  Kept as a separate patch so it's
easier to merge back and forth with CCAN's tdb2.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2011-06-20 18:40:33 +09:30
parent d24ddb0350
commit 6b3f9ac0f8
3 changed files with 18 additions and 4 deletions

View File

@ -22,6 +22,19 @@
#if HAVE_FILE_OFFSET_BITS
#define _FILE_OFFSET_BITS 64
#endif
#include <ccan/likely/likely.h>
#include <ccan/compiler/compiler.h>
#include <ccan/endian/endian.h>
#include "tdb2.h"
#ifdef _SAMBA_BUILD_
#include "replace.h"
#include "system/filesys.h"
#include "system/time.h"
#include "system/shmem.h"
#include "system/select.h"
#include "system/wait.h"
#else
#include <stdint.h>
#include <stdbool.h>
#include <stdlib.h>
@ -35,10 +48,7 @@
#include <stdio.h>
#include <utime.h>
#include <unistd.h>
#include <ccan/tdb2/tdb2.h>
#include <ccan/likely/likely.h>
#include <ccan/compiler/compiler.h>
#include <ccan/endian/endian.h>
#endif
#ifndef TEST_IT
#define TEST_IT(cond)

View File

@ -1,6 +1,8 @@
#include "private.h"
#ifndef _SAMBA_BUILD_
#include <ccan/asprintf/asprintf.h>
#include <stdarg.h>
#endif
static enum TDB_ERROR update_rec_hdr(struct tdb_context *tdb,
tdb_off_t off,

View File

@ -42,6 +42,8 @@ extern "C" {
#include <stdbool.h>
/* For memcmp */
#include <string.h>
#else
#include "replace.h"
#endif
#include <ccan/compiler/compiler.h>
#include <ccan/typesafe_cb/typesafe_cb.h>