aboutsummaryrefslogtreecommitdiff
path: root/src/main.c
diff options
context:
space:
mode:
authordan <dan@noemail.net>2015-03-24 18:21:41 +0000
committerdan <dan@noemail.net>2015-03-24 18:21:41 +0000
commit6da7a0a93da31b48081f50e92d4e7b5ffe19522d (patch)
tree3e9128ad52de6f69aa11508109f8eb28d1bb2309 /src/main.c
parentf37120a416aee4703f5305e68c7535927678cc87 (diff)
parent126e9e6347216e47b538e4e8f24cfc2d752d89b3 (diff)
downloadsqlite-6da7a0a93da31b48081f50e92d4e7b5ffe19522d.tar.gz
sqlite-6da7a0a93da31b48081f50e92d4e7b5ffe19522d.zip
Merge the latest trunk changes into this branch.
FossilOrigin-Name: 9d9b6c883b4f7d69c615cedfb59a2385aac47b74
Diffstat (limited to 'src/main.c')
-rw-r--r--src/main.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/main.c b/src/main.c
index 092cbf841..696713114 100644
--- a/src/main.c
+++ b/src/main.c
@@ -128,6 +128,11 @@ int sqlite3_initialize(void){
}
#endif
+ /* If the following assert() fails on some obscure processor/compiler
+ ** combination, the work-around is to set the correct pointer
+ ** size at compile-time using -DSQLITE_PTRSIZE=n compile-time option */
+ assert( SQLITE_PTRSIZE==sizeof(char*) );
+
/* If SQLite is already completely initialized, then this call
** to sqlite3_initialize() should be a no-op. But the initialization
** must be complete. So isInit must not be set until the very end