------------------------------------------------------------
revno: 175
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell <[EMAIL PROTECTED]>
branch nick: tridge
timestamp: Sat 2007-04-21 10:09:37 +0200
message:
merge from samba4
modified:
lib/tdb/autogen.sh autogen.sh-20070125040949-7t3f5zdl1q4z9hyv-61
lib/tdb/common/tdb_private.h
tdb_private.h-20070220022425-m1wibgjq7n5hahs6-10
=== modified file 'lib/tdb/autogen.sh'
--- a/lib/tdb/autogen.sh 2007-04-16 12:52:58 +0000
+++ b/lib/tdb/autogen.sh 2007-04-21 08:09:37 +0000
@@ -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
=== modified file 'lib/tdb/common/tdb_private.h'
--- a/lib/tdb/common/tdb_private.h 2007-04-16 12:52:58 +0000
+++ b/lib/tdb/common/tdb_private.h 2007-04-21 08:09:37 +0000
@@ -206,7 +206,7 @@
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);
