1 files changed, 16 insertions, 16 deletions
diff --git a/kexi/3rdparty/kexisql3/src/os_mac.c b/kexi/3rdparty/kexisql3/src/os_mac.c
index 15798b5d3..f393b423b 100644
--- a/kexi/3rdparty/kexisql3/src/os_mac.c
+++ b/kexi/3rdparty/kexisql3/src/os_mac.c
@@ -84,11 +84,11 @@ int sqlite3OsOpenReadWrite(
   if( FSpMakeFSRef(&fsSpec, &fsRef) != noErr )
     return SQLITE_CANTOPEN;
   FSGetDataForkName(&dfName);
-  if( FSOpenFork(&fsRef, dfName.length, dfName.unicode,
+  if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode,
                  fsRdWrShPerm, &(id->refNum)) != noErr ){
-    if( FSOpenFork(&fsRef, dfName.length, dfName.unicode,
+    if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode,
                    fsRdWrPerm, &(id->refNum)) != noErr ){
-      if (FSOpenFork(&fsRef, dfName.length, dfName.unicode,
+      if (FSOpenFork(&fsRef, dfName.length, dfName.tqunicode,
                    fsRdPerm, &(id->refNum)) != noErr )
         return SQLITE_CANTOPEN;
       else
@@ -149,7 +149,7 @@ int sqlite3OsOpenExclusive(const char *zFilename, OsFile *id, int delFlag){
   if( FSpMakeFSRef(&fsSpec, &fsRef) != noErr )
     return SQLITE_CANTOPEN;
   FSGetDataForkName(&dfName);
-  if( FSOpenFork(&fsRef, dfName.length, dfName.unicode,
+  if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode,
                  fsRdWrPerm, &(id->refNum)) != noErr )
     return SQLITE_CANTOPEN;
 # else
@@ -185,7 +185,7 @@ int sqlite3OsOpenReadOnly(const char *zFilename, OsFile *id){
   if( FSpMakeFSRef(&fsSpec, &fsRef) != noErr )
     return SQLITE_CANTOPEN;
   FSGetDataForkName(&dfName);
-  if( FSOpenFork(&fsRef, dfName.length, dfName.unicode,
+  if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode,
                  fsRdPerm, &(id->refNum)) != noErr )
     return SQLITE_CANTOPEN;
 # else
@@ -232,7 +232,7 @@ int sqlite3OsOpenDirectory(
 int sqlite3OsTempFileName(char *zBuf){
   static char zChars[] =
     "abcdefghijklmnopqrstuvwxyz"
-    "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+    "ABCDEFGHIJKLMNOPTQRSTUVWXYZ"
     "0123456789";
   int i, j;
   char zTempPath[SQLITE_TEMPNAME_SIZE];
@@ -506,20 +506,20 @@ int sqlite3OsReadLock(OsFile *id){
     params.ioParam.ioRefNum = id->refNumRF;
     params.ioParam.ioPosMode = fsFromStart;
     params.ioParam.ioPosOffset = FIRST_LOCKBYTE;
-    params.ioParam.ioReqCount = 1;
+    params.ioParam.ioRetqCount = 1;
     while( cnt-->0 && (res = PBLockRangeSync(&params))!=noErr ){
       UInt32 finalTicks;
       Delay(1, &finalTicks); /* 1/60 sec */
     }
     if( res == noErr ){
       params.ioParam.ioPosOffset = FIRST_LOCKBYTE+1;
-      params.ioParam.ioReqCount = N_LOCKBYTE;
+      params.ioParam.ioRetqCount = N_LOCKBYTE;
       PBUnlockRangeSync(&params);
       params.ioParam.ioPosOffset = FIRST_LOCKBYTE+lk;
-      params.ioParam.ioReqCount = 1;
+      params.ioParam.ioRetqCount = 1;
       res = PBLockRangeSync(&params);
       params.ioParam.ioPosOffset = FIRST_LOCKBYTE;
-      params.ioParam.ioReqCount = 1;
+      params.ioParam.ioRetqCount = 1;
       PBUnlockRangeSync(&params);
     }
     if( res == noErr ){
@@ -550,24 +550,24 @@ int sqlite3OsWriteLock(OsFile *id){
     params.ioParam.ioRefNum = id->refNumRF;
     params.ioParam.ioPosMode = fsFromStart;
     params.ioParam.ioPosOffset = FIRST_LOCKBYTE;
-    params.ioParam.ioReqCount = 1;
+    params.ioParam.ioRetqCount = 1;
     while( cnt-->0 && (res = PBLockRangeSync(&params))!=noErr ){
       UInt32 finalTicks;
       Delay(1, &finalTicks); /* 1/60 sec */
     }
     if( res == noErr ){
       params.ioParam.ioPosOffset = FIRST_LOCKBYTE + id->locked;
-      params.ioParam.ioReqCount = 1;
+      params.ioParam.ioRetqCount = 1;
       if( id->locked==0 
             || PBUnlockRangeSync(&params)==noErr ){
         params.ioParam.ioPosOffset = FIRST_LOCKBYTE+1;
-        params.ioParam.ioReqCount = N_LOCKBYTE;
+        params.ioParam.ioRetqCount = N_LOCKBYTE;
         res = PBLockRangeSync(&params);
       }else{
         res = afpRangeNotLocked;
       }
       params.ioParam.ioPosOffset = FIRST_LOCKBYTE;
-      params.ioParam.ioReqCount = 1;
+      params.ioParam.ioRetqCount = 1;
       PBUnlockRangeSync(&params);
     }
     if( res == noErr ){
@@ -596,13 +596,13 @@ int sqlite3OsUnlock(OsFile *id){
     rc = SQLITE_OK;
   }else if( id->locked<0 ){
     params.ioParam.ioPosOffset = FIRST_LOCKBYTE+1;
-    params.ioParam.ioReqCount = N_LOCKBYTE;
+    params.ioParam.ioRetqCount = N_LOCKBYTE;
     PBUnlockRangeSync(&params);
     rc = SQLITE_OK;
     id->locked = 0;
   }else{
     params.ioParam.ioPosOffset = FIRST_LOCKBYTE+id->locked;
-    params.ioParam.ioReqCount = 1;
+    params.ioParam.ioRetqCount = 1;
     PBUnlockRangeSync(&params);
     rc = SQLITE_OK;
     id->locked = 0;