diff options
| author | drh <drh@noemail.net> | 2004-09-06 17:24:11 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2004-09-06 17:24:11 +0000 |
| commit | 9bb575fd72e8c92a39f35bfd75591b210908faad (patch) | |
| tree | c71d1973ac94e40d9510c941a3ab0501591f59be /src/expr.c | |
| parent | 873cdcb2ce572b2c1d03d70db8ebfa03266518e9 (diff) | |
| download | sqlite-9bb575fd72e8c92a39f35bfd75591b210908faad.tar.gz sqlite-9bb575fd72e8c92a39f35bfd75591b210908faad.zip | |
Fix a naming conflict between sqlite versions 2 and 3. An open sqlite3
connection now *must* be called "sqlite3". You cannot call it "sqlite".
This might break existing code. (CVS 1941)
FossilOrigin-Name: 3ddf5a9d1c480a2e3aa32685879063b11afddbe1
Diffstat (limited to 'src/expr.c')
| -rw-r--r-- | src/expr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/expr.c b/src/expr.c index 91756363d..b72474a61 100644 --- a/src/expr.c +++ b/src/expr.c @@ -12,7 +12,7 @@ ** This file contains routines used for analyzing expressions and ** for generating VDBE code that evaluates expressions in SQLite. ** -** $Id: expr.c,v 1.159 2004/09/01 03:06:35 drh Exp $ +** $Id: expr.c,v 1.160 2004/09/06 17:24:13 drh Exp $ */ #include "sqliteInt.h" #include <ctype.h> @@ -601,7 +601,7 @@ static int lookupName( int i, j; /* Loop counters */ int cnt = 0; /* Number of matching column names */ int cntTab = 0; /* Number of matching table names */ - sqlite *db = pParse->db; /* The database */ + sqlite3 *db = pParse->db; /* The database */ assert( pColumnToken && pColumnToken->z ); /* The Z in X.Y.Z cannot be NULL */ zDb = sqlite3NameFromToken(pDbToken); @@ -1767,7 +1767,7 @@ int sqlite3ExprAnalyzeAggregates(Parse *pParse, Expr *pExpr){ ** match that requested. */ FuncDef *sqlite3FindFunction( - sqlite *db, /* An open database */ + sqlite3 *db, /* An open database */ const char *zName, /* Name of the function. Not null-terminated */ int nName, /* Number of characters in the name */ int nArg, /* Number of arguments. -1 means any number */ |