1 files changed, 13 insertions, 13 deletions

diff --git a/kexi/3rdparty/kexisql3/src/expr.c b/kexi/3rdparty/kexisql3/src/expr.c
index 45f7fc2f..9d079e1b 100644
--- a/kexi/3rdparty/kexisql3/src/expr.c
+++ b/kexi/3rdparty/kexisql3/src/expr.c
@@ -478,7 +478,7 @@ ExprList *sqlite3ExprListDup(ExprList *p){
 ** called with a NULL argument.
 */
 #if !defined(SQLITE_OMIT_VIEW) || !defined(SQLITE_OMIT_TRIGGER) \
- || !defined(SQLITE_OMIT_SUBQUERY)
+ || !defined(SQLITE_OMIT_SUBTQUERY)
 SrcList *sqlite3SrcListDup(SrcList *p){
   SrcList *pNew;
   int i;
@@ -623,7 +623,7 @@ void sqlite3ExprListDelete(ExprList *pList){
 ** Walk an expression tree.  Call xFunc for each node visited.
 **
 ** The return value from xFunc determines whether the tree walk continues.
-** 0 means continue walking the tree.  1 means do not walk children
+** 0 means continue walking the tree.  1 means do not walk tqchildren
 ** of the current node but continue with siblings.  2 means abandon
 ** the tree walk completely.
 **
@@ -698,7 +698,7 @@ static int exprNodeIsConstant(void *pArg, Expr *pExpr){
     case TK_DOT:
     case TK_AGG_FUNCTION:
     case TK_AGG_COLUMN:
-#ifndef SQLITE_OMIT_SUBQUERY
+#ifndef SQLITE_OMIT_SUBTQUERY
     case TK_SELECT:
     case TK_EXISTS:
 #endif
@@ -1018,15 +1018,15 @@ static int lookupName(
   }
 
   /* If a column from a table in pSrcList is referenced, then record
-  ** this fact in the pSrcList.a[].colUsed bitmask.  Column 0 causes
+  ** this fact in the pSrcList.a[].colUsed bittqmask.  Column 0 causes
   ** bit 0 to be set.  Column 1 sets bit 1.  And so forth.  If the
-  ** column number is greater than the number of bits in the bitmask
-  ** then set the high-order bit of the bitmask.
+  ** column number is greater than the number of bits in the bittqmask
+  ** then set the high-order bit of the bittqmask.
   */
   if( pExpr->iColumn>=0 && pMatch!=0 ){
     int n = pExpr->iColumn;
-    if( n>=sizeof(Bitmask)*8 ){
-      n = sizeof(Bitmask)*8-1;
+    if( n>=sizeof(Bittqmask)*8 ){
+      n = sizeof(Bittqmask)*8-1;
     }
     assert( pMatch->iCursor==pExpr->iTable );
     pMatch->colUsed |= 1<<n;
@@ -1190,7 +1190,7 @@ static int nameResolverStep(void *pArg, Expr *pExpr){
       */
       return is_agg;
     }
-#ifndef SQLITE_OMIT_SUBQUERY
+#ifndef SQLITE_OMIT_SUBTQUERY
     case TK_SELECT:
     case TK_EXISTS:
 #endif
@@ -1273,7 +1273,7 @@ struct QueryCoder {
 ** of allowed values.  The second form causes the SELECT to generate 
 ** a temporary table.
 */
-#ifndef SQLITE_OMIT_SUBQUERY
+#ifndef SQLITE_OMIT_SUBTQUERY
 void sqlite3CodeSubselect(Parse *pParse, Expr *pExpr){
   int testAddr = 0;                       /* One-time test address */
   Vdbe *v = sqlite3GetVdbe(pParse);
@@ -1414,7 +1414,7 @@ void sqlite3CodeSubselect(Parse *pParse, Expr *pExpr){
   }
   return;
 }
-#endif /* SQLITE_OMIT_SUBQUERY */
+#endif /* SQLITE_OMIT_SUBTQUERY */
 
 /*
 ** Generate an instruction that will put the integer describe by
@@ -1649,7 +1649,7 @@ void sqlite3ExprCode(Parse *pParse, Expr *pExpr){
       sqlite3VdbeOp3(v, OP_Function, constMask, nExpr, (char*)pDef, P3_FUNCDEF);
       break;
     }
-#ifndef SQLITE_OMIT_SUBQUERY
+#ifndef SQLITE_OMIT_SUBTQUERY
     case TK_EXISTS:
     case TK_SELECT: {
       sqlite3CodeSubselect(pParse, pExpr);
@@ -1949,7 +1949,7 @@ void sqlite3ExprIfFalse(Parse *pParse, Expr *pExpr, int dest, int jumpIfNull){
   */
   op = ((pExpr->op+(TK_ISNULL&1))^1)-(TK_ISNULL&1);
 
-  /* Verify correct alignment of TK_ and OP_ constants
+  /* Verify correct tqalignment of TK_ and OP_ constants
   */
   assert( pExpr->op!=TK_ISNULL || op==OP_NotNull );
   assert( pExpr->op!=TK_NOTNULL || op==OP_IsNull );