mirror of
https://github.com/sqlite/sqlite.git
synced 2025-11-12 13:01:09 +03:00
Ignore the return structure of and F_GETLK fcntl() call on djgpp. Fix for #3642. (CVS 6268)
FossilOrigin-Name: 8227af3463ded1c52d0a16c63b8dbc516eab57f0
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user