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

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);

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);