mirrors
/
sqlite
mirror of https://github.com/sqlite/sqlite
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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:
danielk1977 2009-02-09 05:32:32 +00:00
parent 53b6028b9c
commit 09480a9dc2
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@ -1,5 +1,5 @@
C Attempt\sto\sreproduce\sticket\s#3643.\sNo\sluck\syet.\s(CVS\s6267)
D 2009-02-09T05:18:33
C Ignore\sthe\sreturn\sstructure\sof\sand\sF_GETLK\sfcntl()\scall\son\sdjgpp.\sFix\sfor\s#3642.\s(CVS\s6268)
D 2009-02-09T05:32:32
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
F Makefile.in c7a5a30fb6852bd7839b1024e1661da8549878ee
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@ -141,7 +141,7 @@ F src/os.c ed93a6b46132a602c4fd7a58142e2981c829c79d
F src/os.h fa3f4aa0119ff721a2da4b47ffd74406ac864c05
F src/os_common.h 24525d8b7bce66c374dfc1810a6c9043f3359b60
F src/os_os2.c bed77dc26e3a95ce4a204936b9a1ca6fe612fcc5
F src/os_unix.c f0fce3042011d462b8ae633564a5668260bd3636
F src/os_unix.c 9f89f98c0782b89a73af08b8acc8bb5d3de5883d
F src/os_win.c 45cb430884da7e9360a55a0fcd5c2c44c22dd79d
F src/pager.c 8c946cca1c1e64bd2d4b15aa431481c96233c826
F src/pager.h 0c9f3520c00d8a3b8e792ca56c9a11b6b02b4b0f
@ -701,7 +701,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
P 9b8c8b18cf6b7d44d5fd64760537bc030097756b
R 30e7465bf00e62fd3b315d77cbcb5a84
P 8f2f98d247b04ae6bda34621e9ccdba904f34ad7
R 0f06921c0632b40086153d35031273c0
U danielk1977
Z 1ea699664ab462d2f37775530d59d28e
Z b82cb16c7d4a63bad217eabb0a69a201

2
manifest.uuid
View File

@ -1 +1 @@
8f2f98d247b04ae6bda34621e9ccdba904f34ad7
8227af3463ded1c52d0a16c63b8dbc516eab57f0

6
src/os_unix.c
View File

@ -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;