From 09480a9dc206161e15dba034db01bfbd97025e19 Mon Sep 17 00:00:00 2001
From: danielk1977 <danielk1977@noemail.net>
Date: Mon, 9 Feb 2009 05:32:32 +0000
Subject: Ignore the return structure of and F_GETLK fcntl() call on djgpp. Fix
 for #3642. (CVS 6268)

FossilOrigin-Name: 8227af3463ded1c52d0a16c63b8dbc516eab57f0
---
 src/os_unix.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/os_unix.c')

diff --git a/src/os_unix.c b/src/os_unix.c
index 9ac7f7b2b..dd746e6db 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -43,7 +43,7 @@
 **   *  Definitions of sqlite3_vfs objects for all locking methods
 **      plus implementations of sqlite3_os_init() and sqlite3_os_end().
 **
-** $Id: os_unix.c,v 1.239 2009/02/03 15:27:02 drh Exp $
+** $Id: os_unix.c,v 1.240 2009/02/09 05:32:32 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #if SQLITE_OS_UNIX              /* This file is used on unix only */
@@ -1089,6 +1089,7 @@ static int unixCheckReservedLock(sqlite3_file *id, int *pResOut){
 
   /* Otherwise see if some other process holds it.
   */
+#ifndef __DJGPP__
   if( !reserved ){
     struct flock lock;
     lock.l_whence = SEEK_SET;
@@ -1103,6 +1104,7 @@ static int unixCheckReservedLock(sqlite3_file *id, int *pResOut){
       reserved = 1;
     }
   }
+#endif
   
   unixLeaveMutex();
   OSTRACE4("TEST WR-LOCK %d %d %d\n", pFile->h, rc, reserved);
@@ -1430,7 +1432,7 @@ static int unixUnlock(sqlite3_file *id, int locktype){
         if( IS_LOCK_ERROR(rc) ){
           pFile->lastErrno = tErrno;
         }
-				goto end_unlock;
+        goto end_unlock;
       }
     }
     lock.l_type = F_UNLCK;
-- 
cgit v1.2.3