Timothy Pearson 12 years ago
commit a48d488266

@ -1371,7 +1371,7 @@ int sqliteOsReadLock(OsFile *id){
ovlp.Offset = FIRST_LOCKBYTE+1;
ovlp.OffsetHigh = 0;
ovlp.hEvent = 0;
res = LockFileEx(id->h, LOCTDEFILE_FAIL_IMMEDIATELY,
res = LockFileEx(id->h, LOCKFILE_FAIL_IMMEDIATELY,
0, N_LOCKBYTE, 0, &ovlp);
}else{
res = LockFile(id->h, FIRST_LOCKBYTE+lk, 0, 1, 0);

@ -22538,10 +22538,10 @@ static int winFileSize(sqlite3_file *id, sqlite3_int64 *pSize){
}
/*
** LOCTDEFILE_FAIL_IMMEDIATELY is undefined on some Windows systems.
** LOCKFILE_FAIL_IMMEDIATELY is undefined on some Windows systems.
*/
#ifndef LOCTDEFILE_FAIL_IMMEDIATELY
# define LOCTDEFILE_FAIL_IMMEDIATELY 1
#ifndef LOCKFILE_FAIL_IMMEDIATELY
# define LOCKFILE_FAIL_IMMEDIATELY 1
#endif
/*
@ -22556,7 +22556,7 @@ static int getReadLock(winFile *pFile){
ovlp.Offset = SHARED_FIRST;
ovlp.OffsetHigh = 0;
ovlp.hEvent = 0;
res = LockFileEx(pFile->h, LOCTDEFILE_FAIL_IMMEDIATELY,
res = LockFileEx(pFile->h, LOCKFILE_FAIL_IMMEDIATELY,
0, SHARED_SIZE, 0, &ovlp);
}else{
int lk;

Loading…
Cancel
Save