1 files changed, 18 insertions, 18 deletions

diff --git a/kexi/3rdparty/kexisql/tool/lemon.c b/kexi/3rdparty/kexisql/tool/lemon.c
index b801e6b39..84f73d170 100644
--- a/kexi/3rdparty/kexisql/tool/lemon.c
+++ b/kexi/3rdparty/kexisql/tool/lemon.c
@@ -298,7 +298,7 @@ char *Strsafe();
 
 void Strsafe_init(/* void */);
 int Strsafe_insert(/* char * */);
-char *Strsafe_find(/* char * */);
+char *Strsafe_tqfind(/* char * */);
 
 /* Routines for handling symbols of the grammar */
 
@@ -306,7 +306,7 @@ struct symbol *Symbol_new();
 int Symbolcmpp(/* struct symbol **, struct symbol ** */);
 void Symbol_init(/* void */);
 int Symbol_insert(/* struct symbol *, char * */);
-struct symbol *Symbol_find(/* char * */);
+struct symbol *Symbol_tqfind(/* char * */);
 struct symbol *Symbol_Nth(/* int */);
 int Symbol_count(/*  */);
 struct symbol **Symbol_arrayof(/*  */);
@@ -317,14 +317,14 @@ int Configcmp(/* struct config *, struct config * */);
 struct state *State_new();
 void State_init(/* void */);
 int State_insert(/* struct state *, struct config * */);
-struct state *State_find(/* struct config * */);
+struct state *State_tqfind(/* struct config * */);
 struct state **State_arrayof(/*  */);
 
 /* Routines used for efficiency in Configlist_add */
 
 void Configtable_init(/* void */);
 int Configtable_insert(/* struct config * */);
-struct config *Configtable_find(/* struct config * */);
+struct config *Configtable_tqfind(/* struct config * */);
 void Configtable_clear(/* int(*)(struct config *) */);
 /****************** From the file "action.c" *******************************/
 /*
@@ -510,7 +510,7 @@ struct lemon *lemp;
 
   /* Find the start symbol */
   if( lemp->start ){
-    sp = Symbol_find(lemp->start);
+    sp = Symbol_tqfind(lemp->start);
     if( sp==0 ){
       ErrorMsg(lemp->filename,0,
 "The specified start symbol \"%s\" is not \
@@ -571,7 +571,7 @@ struct lemon *lemp;
   bp = Configlist_basis();
 
   /* Get a state with the same basis */
-  stp = State_find(bp);
+  stp = State_tqfind(bp);
   if( stp ){
     /* A state with the same basis already exists!  Copy all the follow-set
     ** propagation links from the state under construction into the
@@ -755,7 +755,7 @@ struct lemon *lemp;
 
   /* Add the accepting token */
   if( lemp->start ){
-    sp = Symbol_find(lemp->start);
+    sp = Symbol_tqfind(lemp->start);
     if( sp==0 ) sp = lemp->rule->lhs;
   }else{
     sp = lemp->rule->lhs;
@@ -933,7 +933,7 @@ int dot;            /* Index into the RHS of the rule where the dot goes */
   assert( currentend!=0 );
   model.rp = rp;
   model.dot = dot;
-  cfp = Configtable_find(&model);
+  cfp = Configtable_tqfind(&model);
   if( cfp==0 ){
     cfp = newconfig();
     cfp->rp = rp;
@@ -961,7 +961,7 @@ int dot;
   assert( currentend!=0 );
   model.rp = rp;
   model.dot = dot;
-  cfp = Configtable_find(&model);
+  cfp = Configtable_tqfind(&model);
   if( cfp==0 ){
     cfp = newconfig();
     cfp->rp = rp;
@@ -2542,10 +2542,10 @@ struct lemon *lemp;
 
 /* Search for the file "name" which is in the same directory as
 ** the exacutable */
-PRIVATE char *pathsearch(argv0,name,modemask)
+PRIVATE char *pathsearch(argv0,name,modetqmask)
 char *argv0;
 char *name;
-int modemask;
+int modetqmask;
 {
   char *pathlist;
   char *path,*cp;
@@ -2578,7 +2578,7 @@ int modemask;
         *cp = c;
         if( c==0 ) pathlist = "";
         else pathlist = &cp[1];
-        if( access(path,modemask)==0 ) break;
+        if( access(path,modetqmask)==0 ) break;
       }
     }
   }
@@ -3470,7 +3470,7 @@ char *y;
 {
   char *z;
 
-  z = Strsafe_find(y);
+  z = Strsafe_tqfind(y);
   if( z==0 && (z=malloc( strlen(y)+1 ))!=0 ){
     strcpy(z,y);
     Strsafe_insert(z);
@@ -3581,7 +3581,7 @@ char *data;
 
 /* Return a pointer to data assigned to the given key.  Return NULL
 ** if no such key. */
-char *Strsafe_find(key)
+char *Strsafe_tqfind(key)
 char *key;
 {
   int h;
@@ -3605,7 +3605,7 @@ char *x;
 {
   struct symbol *sp;
 
-  sp = Symbol_find(x);
+  sp = Symbol_tqfind(x);
   if( sp==0 ){
     sp = (struct symbol *)malloc( sizeof(struct symbol) );
     MemoryCheck(sp);
@@ -3738,7 +3738,7 @@ char *key;
 
 /* Return a pointer to data assigned to the given key.  Return NULL
 ** if no such key. */
-struct symbol *Symbol_find(key)
+struct symbol *Symbol_tqfind(key)
 char *key;
 {
   int h;
@@ -3944,7 +3944,7 @@ struct config *key;
 
 /* Return a pointer to data assigned to the given key.  Return NULL
 ** if no such key. */
-struct state *State_find(key)
+struct state *State_tqfind(key)
 struct config *key;
 {
   int h;
@@ -4087,7 +4087,7 @@ struct config *data;
 
 /* Return a pointer to data assigned to the given key.  Return NULL
 ** if no such key. */
-struct config *Configtable_find(key)
+struct config *Configtable_tqfind(key)
 struct config *key;
 {
   int h;