summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-04-17 17:03:38 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:19:26 -0500
commit6f9f5bd745b594e63c0b982967a03620e91999a5 (patch)
treee2a62dc7305a9eab78afeeb9003d0ad634da3e91 /source3
parent97079ab953a9021d67b3ec775d0321d1d4bd0e73 (diff)
downloadsamba-6f9f5bd745b594e63c0b982967a03620e91999a5.tar.gz
samba-6f9f5bd745b594e63c0b982967a03620e91999a5.tar.bz2
samba-6f9f5bd745b594e63c0b982967a03620e91999a5.zip
r22316: merge from samba4:
this function should be static metze (This used to be commit f722fd32da56aabca2fffe243e89177bc23e2be7)
Diffstat (limited to 'source3')
-rw-r--r--source3/lib/tdb/common/transaction.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/lib/tdb/common/transaction.c b/source3/lib/tdb/common/transaction.c
index 640cd5014d..0a609af521 100644
--- a/source3/lib/tdb/common/transaction.c
+++ b/source3/lib/tdb/common/transaction.c
@@ -358,8 +358,8 @@ static int transaction_expand_file(struct tdb_context *tdb, tdb_off_t size,
/*
brlock during a transaction - ignore them
*/
-int transaction_brlock(struct tdb_context *tdb, tdb_off_t offset,
- int rw_type, int lck_type, int probe, size_t len)
+static int transaction_brlock(struct tdb_context *tdb, tdb_off_t offset,
+ int rw_type, int lck_type, int probe, size_t len)
{
return 0;
}