Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/amarok

amarok/src/sqlite/sqlite3.c

@@ -17211,10 +17211,10 @@ static int winFileSize(OsFile *id, i64 *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
 
 /*
@@ -17229,7 +17229,7 @@ static int getReadLock(winFile *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);