diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-17 23:01:47 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-17 23:01:47 -0600 |
| commit | a48d4882664ab09c31dd30e7deb975d5281152ae (patch) | |
| tree | acaf6c484cecd68ac222dd59e74ab510fc1c21e8 | |
| parent | 1f970dd5e8b4f158858820f5cd48f60fd0d250cb (diff) | |
| parent | 4557db2fae1e33cf058a6e8512a56a0037c356e8 (diff) | |
| download | digikam-a48d4882664ab09c31dd30e7deb975d5281152ae.tar.gz digikam-a48d4882664ab09c31dd30e7deb975d5281152ae.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/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; |