diff options
| author | Jeremy Allison <jra@samba.org> | 2001-04-13 19:12:06 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2001-04-13 19:12:06 +0000 |
| commit | 2ef68c7e92d4661664f0410509f7cb551e74a198 (patch) | |
| tree | 7a3ea392bf8664e28ad46b2edb1afd750335ccc9 /source3/locking/posix.c | |
| parent | 14748b0bf56239695cadb6aa40d9095259ebb6e2 (diff) | |
| download | samba-2ef68c7e92d4661664f0410509f7cb551e74a198.tar.gz samba-2ef68c7e92d4661664f0410509f7cb551e74a198.tar.bz2 samba-2ef68c7e92d4661664f0410509f7cb551e74a198.zip | |
Merge of Andrew's changes in 2.2.
Jeremy.
(This used to be commit fc76681812b1469208ad6c8847afdfc68bc6db49)
Diffstat (limited to 'source3/locking/posix.c')
| -rw-r--r-- | source3/locking/posix.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/source3/locking/posix.c b/source3/locking/posix.c index fbdcf662fc..75fc6272b5 100644 --- a/source3/locking/posix.c +++ b/source3/locking/posix.c @@ -632,12 +632,11 @@ static BOOL posix_lock_in_range(SMB_OFF_T *offset_out, SMB_OFF_T *count_out, return True; } -#if defined(LARGE_SMB_OFF_T) /**************************************************************************** Pathetically try and map a 64 bit lock offset into 31 bits. I hate Windows :-). ****************************************************************************/ -static uint32 map_lock_offset(uint32 high, uint32 low) +uint32 map_lock_offset(uint32 high, uint32 low) { unsigned int i; uint32 mask = 0; @@ -664,7 +663,6 @@ static uint32 map_lock_offset(uint32 high, uint32 low) return (high|low); } -#endif /**************************************************************************** Actual function that does POSIX locks. Copes with 64 -> 32 bit cruft and |