diff options
| author | drh <drh@noemail.net> | 2014-10-14 13:41:32 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2014-10-14 13:41:32 +0000 |
| commit | 92fe38ece56c01929b8ad949c94a8b7732db496c (patch) | |
| tree | 14273daa821b50e1da797883ca36de3a78329512 /src/sqliteInt.h | |
| parent | 78aad7cd1d026afa649460cf0ed6508c3d88a16e (diff) | |
| parent | 8dd8362d6446e8d83fd621122987f048216197c2 (diff) | |
| download | sqlite-92fe38ece56c01929b8ad949c94a8b7732db496c.tar.gz sqlite-92fe38ece56c01929b8ad949c94a8b7732db496c.zip | |
Merge recent trunk micro-optimizations and the DESC index GROUP BY ORDER BY
bug fix into the sessions branch.
FossilOrigin-Name: 83d4114f2aa404e670ced33511183baacd813a01
Diffstat (limited to 'src/sqliteInt.h')
| -rw-r--r-- | src/sqliteInt.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/sqliteInt.h b/src/sqliteInt.h index 02ae089b1..081115b8a 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -159,7 +159,7 @@ */ #if defined(__GNUC__) # define SQLITE_NOINLINE __attribute__((noinline)) -#elif defined(_MSC_VER) +#elif defined(_MSC_VER) && _MSC_VER>=1310 # define SQLITE_NOINLINE __declspec(noinline) #else # define SQLITE_NOINLINE @@ -2677,7 +2677,6 @@ struct AuthContext { #define OPFLAG_ISUPDATE 0x04 /* This OP_Insert is an sql UPDATE */ #define OPFLAG_APPEND 0x08 /* This is likely to be an append */ #define OPFLAG_USESEEKRESULT 0x10 /* Try to avoid a seek in BtreeInsert() */ -#define OPFLAG_CLEARCACHE 0x20 /* Clear pseudo-table cache in OP_Column */ #define OPFLAG_ISNOOP 0x40 /* OP_Delete does pre-update-hook only */ #define OPFLAG_LENGTHARG 0x40 /* OP_Column only used for length() */ #define OPFLAG_TYPEOFARG 0x80 /* OP_Column only used for typeof() */ |