diff options
author | drh <drh@noemail.net> | 2012-03-30 00:00:36 +0000 |
---|---|---|
committer | drh <drh@noemail.net> | 2012-03-30 00:00:36 +0000 |
commit | 4e245a4c35fd2e34923f1cf047cbd74f5b67273e (patch) | |
tree | 1bb11752ef1c910623598126fdf5094a6f7e2bcc /src/expr.c | |
parent | 06801f6ff04a69151801a8f568e243adf2a89dc6 (diff) | |
download | sqlite-4e245a4c35fd2e34923f1cf047cbd74f5b67273e.tar.gz sqlite-4e245a4c35fd2e34923f1cf047cbd74f5b67273e.zip |
Fix compiler warnings on GCC and MSVC and fix a C89-ism that
broke the build for MSVC.
FossilOrigin-Name: b451c0f97f0abe78ebe6c62ff489ec1ad8a1f767
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 191545474..5e3f1204a 100644 --- a/src/expr.c +++ b/src/expr.c @@ -2599,11 +2599,11 @@ int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target){ ** loading. */ if( (pDef->flags & (SQLITE_FUNC_LENGTH|SQLITE_FUNC_TYPEOF))!=0 ){ - u8 op; + u8 exprOp; assert( nFarg==1 ); assert( pFarg->a[0].pExpr!=0 ); - op = pFarg->a[0].pExpr->op; - if( op==TK_COLUMN || op==TK_AGG_COLUMN ){ + exprOp = pFarg->a[0].pExpr->op; + if( exprOp==TK_COLUMN || exprOp==TK_AGG_COLUMN ){ assert( SQLITE_FUNC_LENGTH==OPFLAG_LENGTHARG ); assert( SQLITE_FUNC_TYPEOF==OPFLAG_TYPEOFARG ); testcase( pDef->flags==SQLITE_FUNC_LENGTH ); |