diff options
| author | Jeremy Allison <jra@samba.org> | 2007-11-07 07:13:44 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:44:42 +0100 |
| commit | 523445cdaa118fd9cb61d63d1a71a0762b98cdcf (patch) | |
| tree | fb55d44597f4826a088f9dc821286f6896a46cbd /source4 | |
| parent | 2cb22d93ae0eef86a4bcf0fe5f7fb138e43db880 (diff) | |
| download | samba-523445cdaa118fd9cb61d63d1a71a0762b98cdcf.tar.gz samba-523445cdaa118fd9cb61d63d1a71a0762b98cdcf.tar.bz2 samba-523445cdaa118fd9cb61d63d1a71a0762b98cdcf.zip | |
r25893: Fix ldb, tdb builds (and one warning).
Jeremy.
(This used to be commit 52b26645b04a9c5fb70e7b869b60c9157f821d50)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/lib/ldb/ldb_tdb/ldb_tdb.h | 2 | ||||
| -rw-r--r-- | source4/lib/tdb/common/io.c | 2 | ||||
| -rw-r--r-- | source4/lib/tdb/tools/tdbtorture.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/source4/lib/ldb/ldb_tdb/ldb_tdb.h b/source4/lib/ldb/ldb_tdb/ldb_tdb.h index b5e6472054..51e72c1c0f 100644 --- a/source4/lib/ldb/ldb_tdb/ldb_tdb.h +++ b/source4/lib/ldb/ldb_tdb/ldb_tdb.h @@ -1,6 +1,8 @@ #if (_SAMBA_BUILD_ == 3) #include "tdb/include/tdb.h" #else +#include "replace.h" +#include "system/wait.h" #include "tdb.h" #endif diff --git a/source4/lib/tdb/common/io.c b/source4/lib/tdb/common/io.c index c963e66ad4..8ab0768883 100644 --- a/source4/lib/tdb/common/io.c +++ b/source4/lib/tdb/common/io.c @@ -96,7 +96,7 @@ static int tdb_write(struct tdb_context *tdb, tdb_off_t off, "%d of %d bytes at %d, trying once more\n", (int)written, len, off)); errno = ENOSPC; - written = pwrite(tdb->fd, (void *)((char *)buf+written), + written = pwrite(tdb->fd, (const void *)((const char *)buf+written), len-written, off+written); } diff --git a/source4/lib/tdb/tools/tdbtorture.c b/source4/lib/tdb/tools/tdbtorture.c index ca71c736ad..9265cf07aa 100644 --- a/source4/lib/tdb/tools/tdbtorture.c +++ b/source4/lib/tdb/tools/tdbtorture.c @@ -3,10 +3,10 @@ */ #include "replace.h" -#include "tdb.h" #include "system/time.h" #include "system/wait.h" #include "system/filesys.h" +#include "tdb.h" #ifdef HAVE_GETOPT_H #include <getopt.h> |