diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-17 23:02:27 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-17 23:02:27 -0600 |
| commit | 5878aaa1d9826e8d0fad1159fe806c48028fa6de (patch) | |
| tree | a96beee042dc3ac2ffc70b302c11fa2b460743d2 | |
| parent | ab010f2d2ec75661e2a90db18ed3c1c54c08082f (diff) | |
| parent | 22a4159c4cd11b7fdad0d6957cf914bb9b35eaae (diff) | |
| download | koffice-5878aaa1d9826e8d0fad1159fe806c48028fa6de.tar.gz koffice-5878aaa1d9826e8d0fad1159fe806c48028fa6de.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/koffice
| -rw-r--r-- | kexi/3rdparty/kexisql/src/os.c | 2 | ||||
| -rw-r--r-- | kexi/3rdparty/kexisql3/src/os_win.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kexi/3rdparty/kexisql/src/os.c b/kexi/3rdparty/kexisql/src/os.c index 7b03cab72..b47fd9615 100644 --- a/kexi/3rdparty/kexisql/src/os.c +++ b/kexi/3rdparty/kexisql/src/os.c @@ -1367,7 +1367,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); diff --git a/kexi/3rdparty/kexisql3/src/os_win.c b/kexi/3rdparty/kexisql3/src/os_win.c index 2c1947a57..ec7a08405 100644 --- a/kexi/3rdparty/kexisql3/src/os_win.c +++ b/kexi/3rdparty/kexisql3/src/os_win.c @@ -615,7 +615,7 @@ static int getReadLock(OsFile *id){ ovlp.Offset = SHARED_FIRST; ovlp.OffsetHigh = 0; ovlp.hEvent = 0; - res = LockFileEx(id->h, LOCTDEFILE_FAIL_IMMEDIATELY, 0, SHARED_SIZE,0,&ovlp); + res = LockFileEx(id->h, LOCKFILE_FAIL_IMMEDIATELY, 0, SHARED_SIZE,0,&ovlp); }else{ int lk; sqlite3Randomness(sizeof(lk), &lk); |