diff options
| author | Andrew Tridgell <tridge@samba.org> | 2007-04-21 08:04:58 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:51:18 -0500 |
| commit | a3954258705852d9a65468b8010f154093177a6f (patch) | |
| tree | e88033a3f3233e45e9dcef945a619f4fd1b8969f | |
| parent | b17445950ea2bf51dc28555f4d68e8c374ea5639 (diff) | |
| download | samba-a3954258705852d9a65468b8010f154093177a6f.tar.gz samba-a3954258705852d9a65468b8010f154093177a6f.tar.bz2 samba-a3954258705852d9a65468b8010f154093177a6f.zip | |
r22424: fixed the bad merge (thanks to metze for pointing out)
(This used to be commit bffb8f88006fd2530cad270df642d9a23a01b34b)
| -rwxr-xr-x | source4/lib/tdb/autogen.sh | 2 | ||||
| -rw-r--r-- | source4/lib/tdb/common/tdb_private.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source4/lib/tdb/autogen.sh b/source4/lib/tdb/autogen.sh index 1691689e10..bf84eeee19 100755 --- a/source4/lib/tdb/autogen.sh +++ b/source4/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/source4/lib/tdb/common/tdb_private.h b/source4/lib/tdb/common/tdb_private.h index 9d39de0200..02a23d0387 100644 --- a/source4/lib/tdb/common/tdb_private.h +++ b/source4/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); |