diff options
| author | drh <drh@noemail.net> | 2015-06-17 18:18:51 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2015-06-17 18:18:51 +0000 |
| commit | 5600329bc033aa5837969918d3397e455ee93d51 (patch) | |
| tree | 258ab0590848adbbf5e278c2d3e26b803d5dede2 /src/sqliteInt.h | |
| parent | 60c97e6aa88b96277a4f8e6ba7d9ebd83f956cc3 (diff) | |
| parent | bbe031f9f1260fd97622cfd47dbdf5377daee6b2 (diff) | |
| download | sqlite-5600329bc033aa5837969918d3397e455ee93d51.tar.gz sqlite-5600329bc033aa5837969918d3397e455ee93d51.zip | |
Merge all recent enhancements and fixes from trunk.
FossilOrigin-Name: 199bfb67fdf642cca6cd5d460fa4dc602b94837a
Diffstat (limited to 'src/sqliteInt.h')
| -rw-r--r-- | src/sqliteInt.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/sqliteInt.h b/src/sqliteInt.h index a0608abbe..bcfc1ea3e 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -3078,7 +3078,9 @@ int sqlite3CantopenError(int); # define sqlite3Isxdigit(x) isxdigit((unsigned char)(x)) # define sqlite3Tolower(x) tolower((unsigned char)(x)) #endif +#ifndef SQLITE_OMIT_COMPILEOPTION_DIAGS int sqlite3IsIdChar(u8); +#endif /* ** Internal function prototypes @@ -3106,7 +3108,9 @@ void sqlite3ScratchFree(void*); void *sqlite3PageMalloc(int); void sqlite3PageFree(void*); void sqlite3MemSetDefault(void); +#ifndef SQLITE_OMIT_BUILTIN_TEST void sqlite3BenignMallocHooks(void (*)(void), void (*)(void)); +#endif int sqlite3HeapNearlyFull(void); /* @@ -3250,7 +3254,9 @@ int sqlite3BitvecSet(Bitvec*, u32); void sqlite3BitvecClear(Bitvec*, u32, void*); void sqlite3BitvecDestroy(Bitvec*); u32 sqlite3BitvecSize(Bitvec*); +#ifndef SQLITE_OMIT_BUILTIN_TEST int sqlite3BitvecBuiltinTest(int,int*); +#endif RowSet *sqlite3RowSetInit(sqlite3*, void*, unsigned int); void sqlite3RowSetClear(RowSet*); @@ -3355,8 +3361,10 @@ void sqlite3ExprAnalyzeAggregates(NameContext*, Expr*); void sqlite3ExprAnalyzeAggList(NameContext*,ExprList*); int sqlite3FunctionUsesThisSrc(Expr*, SrcList*); Vdbe *sqlite3GetVdbe(Parse*); +#ifndef SQLITE_OMIT_BUILTIN_TEST void sqlite3PrngSaveState(void); void sqlite3PrngRestoreState(void); +#endif void sqlite3RollbackAll(sqlite3*,int); void sqlite3CodeVerifySchema(Parse*, int); void sqlite3CodeVerifyNamedSchema(Parse*, const char *zDb); |