Author: tridge Date: 2007-04-21 08:04:58 +0000 (Sat, 21 Apr 2007) New Revision: 22424
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22424 Log: fixed the bad merge (thanks to metze for pointing out) Modified: branches/SAMBA_4_0/source/lib/tdb/autogen.sh branches/SAMBA_4_0/source/lib/tdb/common/tdb_private.h Changeset: Modified: branches/SAMBA_4_0/source/lib/tdb/autogen.sh =================================================================== --- branches/SAMBA_4_0/source/lib/tdb/autogen.sh 2007-04-21 07:37:21 UTC (rev 22423) +++ branches/SAMBA_4_0/source/lib/tdb/autogen.sh 2007-04-21 08:04:58 UTC (rev 22424) @@ -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: branches/SAMBA_4_0/source/lib/tdb/common/tdb_private.h =================================================================== --- branches/SAMBA_4_0/source/lib/tdb/common/tdb_private.h 2007-04-21 07:37:21 UTC (rev 22423) +++ branches/SAMBA_4_0/source/lib/tdb/common/tdb_private.h 2007-04-21 08:04:58 UTC (rev 22424) @@ -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);
