database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-14 00:22:38 +03:00
Code Activity

Removed checking of some compile options from the sqlite3_compileopts() API.

Browse Source 
FossilOrigin-Name: 833da702ff9bd99d62640756d80e094256efff5c
This commit is contained in:
shaneh
2010-02-23 05:17:51 +00:00
parent bdea6d1368
commit ca07b9df47
3 changed files with 329 additions and 396 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
manifest
View File

@@ -1,5 +1,5 @@
C Test\snew\sapi\sto\sreport\swhich\soptions\s(defines)\swere\sused\sto\scompile\sSQLite. C Removed\schecking\sof\ssome\scompile\soptions\sfrom\sthe\ssqlite3_compileopts()\sAPI.
D 2010-02-23T04:19:55 D 2010-02-23T05:17:52
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
F Makefile.in c5827ead754ab32b9585487177c93bb00b9497b3 F Makefile.in c5827ead754ab32b9585487177c93bb00b9497b3
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -130,7 +130,7 @@ F src/journal.c b0ea6b70b532961118ab70301c00a33089f9315c
F src/legacy.c 16f385490f377c2c80a6c7357391d499087defed F src/legacy.c 16f385490f377c2c80a6c7357391d499087defed
F src/lempar.c 7f026423f4d71d989e719a743f98a1cbd4e6d99e F src/lempar.c 7f026423f4d71d989e719a743f98a1cbd4e6d99e
F src/loadext.c 1c7a61ce1281041f437333f366a96aa0d29bb581 F src/loadext.c 1c7a61ce1281041f437333f366a96aa0d29bb581
F src/main.c e3e88f01f0f3555b837c867f6cdb9342a5ea3333 F src/main.c e75d96a0bd6f874a18d5dac855d330a4739de0b2
F src/malloc.c 5fa175797f982b178eaf38afba9c588a866be729 F src/malloc.c 5fa175797f982b178eaf38afba9c588a866be729
F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
F src/mem1.c 86f33483a343873bab8ae1b648c2eac55462da74 F src/mem1.c 86f33483a343873bab8ae1b648c2eac55462da74
@@ -791,11 +791,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
P 6d910245ad0097521cf1619449cc3d202137b8b8 P 84c9756993caf82710a0905ed1987d144bc764fd
R dedbbaae7790d6d9129d67a846293910 R f5089208430b2ba4dd4063929e4e20e6
T *bgcolor * pink
T *branch * compile_opts
T *sym-compile_opts *
T -sym-trunk *
U shaneh U shaneh
Z a5cfd4374a14e6e3e3c31ae8396a940a Z 9884f73578eca45685b3905c76fc5c0d

2
manifest.uuid
View File

@@ -1 +1 @@
84c9756993caf82710a0905ed1987d144bc764fd 833da702ff9bd99d62640756d80e094256efff5c

155
src/main.c
View File

@@ -49,41 +49,26 @@ const char *sqlite3_compileopts(void){
#ifdef SQLITE_4_BYTE_ALIGNED_MALLOC #ifdef SQLITE_4_BYTE_ALIGNED_MALLOC
iOther |= ((sqlite_int64)1<<1); iOther |= ((sqlite_int64)1<<1);
#endif #endif
#ifdef SQLITE_AMALGAMATION #ifdef SQLITE_API
iOther |= ((sqlite_int64)1<<2); iOther |= ((sqlite_int64)1<<2);
#endif #endif
#ifdef SQLITE_API #ifdef SQLITE_CASE_SENSITIVE_LIKE
iOther |= ((sqlite_int64)1<<3); iOther |= ((sqlite_int64)1<<3);
#endif #endif
#ifdef SQLITE_ASCII #ifdef SQLITE_CHECK_PAGES
iOther |= ((sqlite_int64)1<<4); iOther |= ((sqlite_int64)1<<4);
#endif #endif
#ifdef SQLITE_BIG_DBL #ifdef SQLITE_COVERAGE_TEST
iOther |= ((sqlite_int64)1<<5); iOther |= ((sqlite_int64)1<<5);
#endif #endif
#ifdef SQLITE_CASE_SENSITIVE_LIKE #ifdef SQLITE_DEBUG
iOther |= ((sqlite_int64)1<<6); iOther |= ((sqlite_int64)1<<6);
#endif #endif
#ifdef SQLITE_CHECK_PAGES #ifdef SQLITE_DISABLE_DIRSYNC
iOther |= ((sqlite_int64)1<<7); iOther |= ((sqlite_int64)1<<7);
#endif #endif
#ifdef SQLITE_CORE
iOther |= ((sqlite_int64)1<<8);
#endif
#ifdef SQLITE_COVERAGE_TEST
iOther |= ((sqlite_int64)1<<9);
#endif
#ifdef SQLITE_DEBUG
iOther |= ((sqlite_int64)1<<10);
#endif
#ifdef SQLITE_DISABLE_DIRSYNC
iOther |= ((sqlite_int64)1<<11);
#endif
#ifdef SQLITE_DISABLE_LFS #ifdef SQLITE_DISABLE_LFS
iOther |= ((sqlite_int64)1<<12); iOther |= ((sqlite_int64)1<<8);
#endif
#ifdef SQLITE_EBCDIC
iOther |= ((sqlite_int64)1<<13);
#endif #endif
#ifdef SQLITE_ENABLE_ATOMIC_WRITE #ifdef SQLITE_ENABLE_ATOMIC_WRITE
iEnable |= ((sqlite_int64)1<<0); iEnable |= ((sqlite_int64)1<<0);
@@ -106,107 +91,92 @@ const char *sqlite3_compileopts(void){
#ifdef SQLITE_ENABLE_FTS3 #ifdef SQLITE_ENABLE_FTS3
iEnable |= ((sqlite_int64)1<<6); iEnable |= ((sqlite_int64)1<<6);
#endif #endif
#ifdef SQLITE_ENABLE_FTS4 #ifdef SQLITE_ENABLE_FTS3_PARENTHESIS
iEnable |= ((sqlite_int64)1<<7); iEnable |= ((sqlite_int64)1<<7);
#endif #endif
#ifdef SQLITE_ENABLE_ICU #ifdef SQLITE_ENABLE_FTS4
iEnable |= ((sqlite_int64)1<<8); iEnable |= ((sqlite_int64)1<<8);
#endif #endif
#ifdef SQLITE_ENABLE_IOTRACE #ifdef SQLITE_ENABLE_ICU
iEnable |= ((sqlite_int64)1<<9); iEnable |= ((sqlite_int64)1<<9);
#endif #endif
#ifdef SQLITE_ENABLE_LOAD_EXTENSION #ifdef SQLITE_ENABLE_IOTRACE
iEnable |= ((sqlite_int64)1<<10); iEnable |= ((sqlite_int64)1<<10);
#endif #endif
#ifdef SQLITE_ENABLE_LOCKING_STYLE #ifdef SQLITE_ENABLE_LOAD_EXTENSION
iEnable |= ((sqlite_int64)1<<11); iEnable |= ((sqlite_int64)1<<11);
#endif #endif
#ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT #ifdef SQLITE_ENABLE_LOCKING_STYLE
iEnable |= ((sqlite_int64)1<<12); iEnable |= ((sqlite_int64)1<<12);
#endif #endif
#ifdef SQLITE_ENABLE_MEMSYS3 #ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT
iEnable |= ((sqlite_int64)1<<13); iEnable |= ((sqlite_int64)1<<13);
#endif #endif
#ifdef SQLITE_ENABLE_MEMSYS5 #ifdef SQLITE_ENABLE_MEMSYS3
iEnable |= ((sqlite_int64)1<<14); iEnable |= ((sqlite_int64)1<<14);
#endif #endif
#ifdef SQLITE_ENABLE_OVERSIZE_CELL_CHECK #ifdef SQLITE_ENABLE_MEMSYS5
iEnable |= ((sqlite_int64)1<<15); iEnable |= ((sqlite_int64)1<<15);
#endif #endif
#ifdef SQLITE_ENABLE_RTREE #ifdef SQLITE_ENABLE_OVERSIZE_CELL_CHECK
iEnable |= ((sqlite_int64)1<<16); iEnable |= ((sqlite_int64)1<<16);
#endif #endif
#ifdef SQLITE_ENABLE_STAT2 #ifdef SQLITE_ENABLE_RTREE
iEnable |= ((sqlite_int64)1<<17); iEnable |= ((sqlite_int64)1<<17);
#endif #endif
#ifdef SQLITE_ENABLE_UNLOCK_NOTIFY #ifdef SQLITE_ENABLE_STAT2
iEnable |= ((sqlite_int64)1<<18); iEnable |= ((sqlite_int64)1<<18);
#endif #endif
#ifdef SQLITE_ENABLE_UPDATE_DELETE_LIMIT #ifdef SQLITE_ENABLE_UNLOCK_NOTIFY
iEnable |= ((sqlite_int64)1<<19); iEnable |= ((sqlite_int64)1<<19);
#endif #endif
#ifdef SQLITE_EXTERN #ifdef SQLITE_ENABLE_UPDATE_DELETE_LIMIT
iOther |= ((sqlite_int64)1<<14); iEnable |= ((sqlite_int64)1<<20);
#endif
#ifdef SQLITE_FILE_HEADER
iOther |= ((sqlite_int64)1<<15);
#endif #endif
#ifdef SQLITE_HAS_CODEC #ifdef SQLITE_HAS_CODEC
iOther |= ((sqlite_int64)1<<16); iOther |= ((sqlite_int64)1<<9);
#endif #endif
#ifdef SQLITE_HAVE_ISNAN #ifdef SQLITE_HAVE_ISNAN
iOther |= ((sqlite_int64)1<<17); iOther |= ((sqlite_int64)1<<10);
#endif #endif
#ifdef SQLITE_HOMEGROWN_RECURSIVE_MUTEX #ifdef SQLITE_HOMEGROWN_RECURSIVE_MUTEX
iOther |= ((sqlite_int64)1<<18); iOther |= ((sqlite_int64)1<<11);
#endif #endif
#ifdef SQLITE_IGNORE_AFP_LOCK_ERRORS #ifdef SQLITE_IGNORE_AFP_LOCK_ERRORS
iOther |= ((sqlite_int64)1<<19); iOther |= ((sqlite_int64)1<<12);
#endif #endif
#ifdef SQLITE_IGNORE_FLOCK_LOCK_ERRORS #ifdef SQLITE_IGNORE_FLOCK_LOCK_ERRORS
iOther |= ((sqlite_int64)1<<20); iOther |= ((sqlite_int64)1<<13);
#endif #endif
#ifdef SQLITE_INT64_TYPE #ifdef SQLITE_INT64_TYPE
iOther |= ((sqlite_int64)1<<21); iOther |= ((sqlite_int64)1<<14);
#endif
#ifdef SQLITE_INTEGRITY_CHECK_ERROR_MAX
iOther |= ((sqlite_int64)1<<22);
#endif #endif
#ifdef SQLITE_LOCK_TRACE #ifdef SQLITE_LOCK_TRACE
iOther |= ((sqlite_int64)1<<23); iOther |= ((sqlite_int64)1<<15);
#endif
#ifdef SQLITE_MALLOC_SOFT_LIMIT
iOther |= ((sqlite_int64)1<<24);
#endif #endif
#ifdef SQLITE_MEMDEBUG #ifdef SQLITE_MEMDEBUG
iOther |= ((sqlite_int64)1<<25); iOther |= ((sqlite_int64)1<<16);
#endif #endif
#ifdef SQLITE_MIXED_ENDIAN_64BIT_FLOAT #ifdef SQLITE_MIXED_ENDIAN_64BIT_FLOAT
iOther |= ((sqlite_int64)1<<26); iOther |= ((sqlite_int64)1<<17);
#endif #endif
#ifdef SQLITE_MUTEX_NOOP #ifdef SQLITE_MUTEX_NOOP
iOther |= ((sqlite_int64)1<<27); iOther |= ((sqlite_int64)1<<18);
#endif #endif
#ifdef SQLITE_MUTEX_OMIT #ifdef SQLITE_MUTEX_OMIT
iOther |= ((sqlite_int64)1<<28); iOther |= ((sqlite_int64)1<<19);
#endif #endif
#ifdef SQLITE_MUTEX_OS2 #ifdef SQLITE_MUTEX_OS2
iOther |= ((sqlite_int64)1<<29); iOther |= ((sqlite_int64)1<<20);
#endif #endif
#ifdef SQLITE_MUTEX_PTHREADS #ifdef SQLITE_MUTEX_PTHREADS
iOther |= ((sqlite_int64)1<<30); iOther |= ((sqlite_int64)1<<21);
#endif #endif
#ifdef SQLITE_MUTEX_W32 #ifdef SQLITE_MUTEX_W32
iOther |= ((sqlite_int64)1<<31); iOther |= ((sqlite_int64)1<<22);
#endif #endif
#ifdef SQLITE_NO_SYNC #ifdef SQLITE_NO_SYNC
iOther |= ((sqlite_int64)1<<32); iOther |= ((sqlite_int64)1<<23);
#endif
#ifdef SQLITE_N_COLCACHE
iOther |= ((sqlite_int64)1<<33);
#endif
#ifdef SQLITE_N_KEYWORD
iOther |= ((sqlite_int64)1<<34);
#endif #endif
#ifdef SQLITE_OMIT_ALTERTABLE #ifdef SQLITE_OMIT_ALTERTABLE
iOmit |= ((sqlite_int64)1<<0); iOmit |= ((sqlite_int64)1<<0);
@@ -367,65 +337,32 @@ const char *sqlite3_compileopts(void){
#ifdef SQLITE_OMIT_XFER_OPT #ifdef SQLITE_OMIT_XFER_OPT
iOmit |= ((sqlite_int64)1<<52); iOmit |= ((sqlite_int64)1<<52);
#endif #endif
#ifdef SQLITE_OS_OTHER
iOther |= ((sqlite_int64)1<<35);
#endif
#ifdef SQLITE_OS_UNIX
iOther |= ((sqlite_int64)1<<36);
#endif
#ifdef SQLITE_PERFORMANCE_TRACE #ifdef SQLITE_PERFORMANCE_TRACE
iOther |= ((sqlite_int64)1<<37); iOther |= ((sqlite_int64)1<<24);
#endif
#ifdef SQLITE_PRINT_BUF_SIZE
iOther |= ((sqlite_int64)1<<38);
#endif
#ifdef SQLITE_PRIVATE
iOther |= ((sqlite_int64)1<<39);
#endif #endif
#ifdef SQLITE_PROXY_DEBUG #ifdef SQLITE_PROXY_DEBUG
iOther |= ((sqlite_int64)1<<40); iOther |= ((sqlite_int64)1<<25);
#endif #endif
#ifdef SQLITE_SECURE_DELETE #ifdef SQLITE_SECURE_DELETE
iOther |= ((sqlite_int64)1<<41); iOther |= ((sqlite_int64)1<<26);
#endif #endif
#ifdef SQLITE_SMALL_STACK #ifdef SQLITE_SMALL_STACK
iOther |= ((sqlite_int64)1<<42); iOther |= ((sqlite_int64)1<<27);
#endif #endif
#ifdef SQLITE_SOUNDEX #ifdef SQLITE_SOUNDEX
iOther |= ((sqlite_int64)1<<43); iOther |= ((sqlite_int64)1<<28);
#endif
#ifdef SQLITE_SYSTEM_MALLOC
iOther |= ((sqlite_int64)1<<44);
#endif #endif
#ifdef SQLITE_TCL #ifdef SQLITE_TCL
iOther |= ((sqlite_int64)1<<45); iOther |= ((sqlite_int64)1<<29);
#endif
#ifdef SQLITE_TEMP_FILE_PREFIX
iOther |= ((sqlite_int64)1<<46);
#endif
#ifdef SQLITE_TEMP_STORE
iOther |= ((sqlite_int64)1<<47);
#endif #endif
#ifdef SQLITE_TEST #ifdef SQLITE_TEST
iOther |= ((sqlite_int64)1<<48); iOther |= ((sqlite_int64)1<<30);
#endif
#ifdef SQLITE_TEXT
iOther |= ((sqlite_int64)1<<49);
#endif
#ifdef SQLITE_THREADSAFE
iOther |= ((sqlite_int64)1<<50);
#endif #endif
#ifdef SQLITE_USE_ALLOCA #ifdef SQLITE_USE_ALLOCA
iOther |= ((sqlite_int64)1<<51); iOther |= ((sqlite_int64)1<<31);
#endif
#ifdef SQLITE_VERSION
iOther |= ((sqlite_int64)1<<52);
#endif
#ifdef SQLITE_VERSION_NUMBER
iOther |= ((sqlite_int64)1<<53);
#endif #endif
#ifdef SQLITE_ZERO_MALLOC #ifdef SQLITE_ZERO_MALLOC
iOther |= ((sqlite_int64)1<<54); iOther |= ((sqlite_int64)1<<32);
#endif #endif
sqlite3_snprintf(sizeof(zOpts)-1, zOpts, sqlite3_snprintf(sizeof(zOpts)-1, zOpts,