diff --git a/ChangeLog b/ChangeLog
index f07e0d9..349b1d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Dec 30 06:36:25 CST 2004	Jeff Smith <whydoubt@yahoo.com>
+	* include/mdbtools.h: Fix MdbSargTreeFunc's typedef
+	* src/sql/lexer.l: Fix flex warning about A-z ambiguity
+
 Tue Dec 28 21:25:24 CST 2004	Jeff Smith <whydoubt@yahoo.com>
 	* src/libmdb/data.c: Handle dates from 1/1/100 to 12/31/9999
 
diff --git a/include/mdbtools.h b/include/mdbtools.h
index 6c1811d..6179600 100644
--- a/include/mdbtools.h
+++ b/include/mdbtools.h
@@ -308,7 +308,7 @@ typedef struct {
 	unsigned char cache_value[256];
 } MdbIndexPage;
 
-typedef int (*MdbSargTreeFunc)(MdbSargNode *, gpointer *data);
+typedef int (*MdbSargTreeFunc)(MdbSargNode *, gpointer data);
 
 #define MDB_MAX_INDEX_DEPTH 10
 
diff --git a/src/sql/lexer.l b/src/sql/lexer.l
index 037a98b..ddbd912 100644
--- a/src/sql/lexer.l
+++ b/src/sql/lexer.l
@@ -63,7 +63,7 @@ like		{ return LIKE; }
 		return IDENT;
 	}
 
-[A-z][A-z0-9_#@]*		{ yylval.name = strdup(yytext); return NAME; }
+[A-Za-z][A-Za-z0-9_#@]*		{ yylval.name = strdup(yytext); return NAME; }
 
 '[^']*''  {
 		yyless(yyleng-1);
@@ -77,7 +77,7 @@ like		{ return LIKE; }
 (-*[0-9]+|([0-9]*\.[0-9]+)([eE][-+]?[0-9]+)?) { 
 				yylval.name = strdup(yytext); return NUMBER; 
 			}
-~?(\/?[A-z0-9\.]+)+		{ yylval.name = strdup(yytext); return PATH; }
+~?(\/?[A-Za-z0-9\.]+)+		{ yylval.name = strdup(yytext); return PATH; }
 .	{ return yytext[0]; }
 %%