diff options
| author | Andrew Tridgell <tridge@samba.org> | 2007-04-21 10:09:37 +0200 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2007-04-21 10:09:37 +0200 |
| commit | 531f8237eb23cc3da1b31badfbbda04f76558ccf (patch) | |
| tree | 72276ab621cc300e95a65457106f2679ebf2b66c /ctdb/lib | |
| parent | 520f7971cd5b7ad2a4cf53012e139c26b682600d (diff) | |
merge from samba4
(This used to be ctdb commit a64c6ace26559b2793f2a804430fb0fc53f03a34)
Diffstat (limited to 'ctdb/lib')
| -rwxr-xr-x | ctdb/lib/tdb/autogen.sh | 2 | ||||
| -rw-r--r-- | ctdb/lib/tdb/common/tdb_private.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ctdb/lib/tdb/autogen.sh b/ctdb/lib/tdb/autogen.sh index 1691689e10..bf84eeee19 100755 --- a/ctdb/lib/tdb/autogen.sh +++ b/ctdb/lib/tdb/autogen.sh @@ -3,7 +3,7 @@ rm -rf autom4te.cache rm -f configure config.h.in -IPATHS="-I libreplace -I lib/replace -I ../libreplace -I ../replace -I ../lib/replace" +IPATHS="-I libreplace -I lib/replace -I ../libreplace -I ../replace" autoconf $IPATHS || exit 1 autoheader $IPATHS || exit 1 diff --git a/ctdb/lib/tdb/common/tdb_private.h b/ctdb/lib/tdb/common/tdb_private.h index 9d39de0200..02a23d0387 100644 --- a/ctdb/lib/tdb/common/tdb_private.h +++ b/ctdb/lib/tdb/common/tdb_private.h @@ -206,7 +206,7 @@ tdb_off_t tdb_find_lock_hash(struct tdb_context *tdb, TDB_DATA key, u32 hash, in struct list_struct *rec); void tdb_io_init(struct tdb_context *tdb); int tdb_expand(struct tdb_context *tdb, tdb_off_t size); -int rec_free_read(struct tdb_context *tdb, tdb_off_t off, - struct list_struct *rec); +int tdb_rec_free_read(struct tdb_context *tdb, tdb_off_t off, + struct list_struct *rec); |