diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2013-02-17 11:59:25 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-02-17 11:59:25 +0100 |
| commit | 4557db2fae1e33cf058a6e8512a56a0037c356e8 (patch) | |
| tree | 415a81ae2f1fcd1bf606984ee49821cc47f58ee5 /digikam | |
| parent | 0e5a15a74991cd2f442cd3d61bff57175dc61630 (diff) | |
| download | digikam-4557db2fae1e33cf058a6e8512a56a0037c356e8.tar.gz digikam-4557db2fae1e33cf058a6e8512a56a0037c356e8.zip | |
Fix unintended rename of LOCKFILE
Diffstat (limited to 'digikam')
| -rw-r--r-- | digikam/libs/sqlite2/os.c | 2 | ||||
| -rw-r--r-- | digikam/libs/sqlite3/sqlite3.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/digikam/libs/sqlite2/os.c b/digikam/libs/sqlite2/os.c index ecc8a16..dccd65f 100644 --- a/digikam/libs/sqlite2/os.c +++ b/digikam/libs/sqlite2/os.c @@ -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); diff --git a/digikam/libs/sqlite3/sqlite3.c b/digikam/libs/sqlite3/sqlite3.c index 8710eac..3b3b067 100644 --- a/digikam/libs/sqlite3/sqlite3.c +++ b/digikam/libs/sqlite3/sqlite3.c @@ -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; |