diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-02-26 16:19:57 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-02-26 16:19:57 +1100 |
| commit | 864328e6563621a0b4df2d49e04ff3b23b68e1ca (patch) | |
| tree | 01b5af0b454d7235b5118ae53d078429dca26619 /source4/ntvfs/posix/pvfs_lock.c | |
| parent | 2c8415f767ca20fe90a97f8623d1617e015f183a (diff) | |
| parent | 1e5ced379361fbdc0ccc48ad012f388f2e737ca7 (diff) | |
| download | samba-864328e6563621a0b4df2d49e04ff3b23b68e1ca.tar.gz samba-864328e6563621a0b4df2d49e04ff3b23b68e1ca.tar.bz2 samba-864328e6563621a0b4df2d49e04ff3b23b68e1ca.zip | |
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
(This used to be commit 35f7f488d84e3ec3224f3b40ff5881e91c11764d)
Diffstat (limited to 'source4/ntvfs/posix/pvfs_lock.c')
| -rw-r--r-- | source4/ntvfs/posix/pvfs_lock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/ntvfs/posix/pvfs_lock.c b/source4/ntvfs/posix/pvfs_lock.c index b9bb58c71d..df85b2b775 100644 --- a/source4/ntvfs/posix/pvfs_lock.c +++ b/source4/ntvfs/posix/pvfs_lock.c @@ -53,7 +53,7 @@ struct pvfs_pending_lock { struct pvfs_file *f; struct ntvfs_request *req; int pending_lock; - void *wait_handle; + struct pvfs_wait *wait_handle; struct timeval end_time; }; |