From fc76681812b1469208ad6c8847afdfc68bc6db49 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 13 Apr 2001 19:12:06 +0000 Subject: Merge of Andrew's changes in 2.2. Jeremy. --- source/locking/posix.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'source/locking/posix.c') diff --git a/source/locking/posix.c b/source/locking/posix.c index fbdcf662fc9..75fc6272b5a 100644 --- a/source/locking/posix.c +++ b/source/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 -- cgit