diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-03-28 10:21:22 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-04-05 02:39:08 +0200 |
| commit | 96108eed100e1962c4abd75a021d84467ae4d690 (patch) | |
| tree | b82b08ace61748a4886abaef6f1afb4936d3669e /source3/locking | |
| parent | 214a668ff3b189f6b55bd97a12177baf46bd1585 (diff) | |
| download | samba-96108eed100e1962c4abd75a021d84467ae4d690.tar.gz samba-96108eed100e1962c4abd75a021d84467ae4d690.tar.xz samba-96108eed100e1962c4abd75a021d84467ae4d690.zip | |
build: #ifdef LARGE_SMB_OFF_T as off_t is now always 64 bits
Diffstat (limited to 'source3/locking')
| -rw-r--r-- | source3/locking/posix.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/source3/locking/posix.c b/source3/locking/posix.c index abedd5600d..02402f9774 100644 --- a/source3/locking/posix.c +++ b/source3/locking/posix.c @@ -97,9 +97,7 @@ static bool posix_lock_in_range(SMB_OFF_T *offset_out, SMB_OFF_T *count_out, #if defined(MAX_POSITIVE_LOCK_OFFSET) /* Some systems have arbitrary limits. */ SMB_OFF_T max_positive_lock_offset = (MAX_POSITIVE_LOCK_OFFSET); - -#elif defined(LARGE_SMB_OFF_T) && !defined(HAVE_BROKEN_FCNTL64_LOCKS) - +#else /* * In this case SMB_OFF_T is 64 bits, * and the underlying system can handle 64 bit signed locks. @@ -109,18 +107,7 @@ static bool posix_lock_in_range(SMB_OFF_T *offset_out, SMB_OFF_T *count_out, SMB_OFF_T mask = (mask2<<1); SMB_OFF_T max_positive_lock_offset = ~mask; -#else /* !LARGE_SMB_OFF_T || HAVE_BROKEN_FCNTL64_LOCKS */ - - /* - * In this case either SMB_OFF_T is 32 bits, - * or the underlying system cannot handle 64 bit signed locks. - * All offsets & counts must be 2^31 or less. - */ - - SMB_OFF_T max_positive_lock_offset = 0x7FFFFFFF; - -#endif /* !LARGE_SMB_OFF_T || HAVE_BROKEN_FCNTL64_LOCKS */ - +#endif /* * POSIX locks of length zero mean lock to end-of-file. * Win32 locks of length zero are point probes. Ignore |