Add the ATOMIC_INTRINSICS compile-time output output. Move sqlite3Int.h

in front of ctime.c so that default values that are not overridden are
shown in PRAGMA compile-time option output.

FossilOrigin-Name: e306952690bfb140e2c404a74b05ff2d070c487f7e52c62d62a004505fba0e15

diff --git a/manifest b/manifest
index a93cdd7e1d6acf4c11fa5b45e50e6b0b571de522..8570dba9d8f6cbdefb99e23d01f8d6e2a8fb8968 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Revert\s[5204c2c4a7b73a64],\srestoring\sthe\sold\spre-processor\slogic\sfor\sdetermining\sthe\savailability\sof\sthe\s__atomic_store_n()/__atomic_load_n()\sprimitives.
-D 2021-07-05T17:15:38.183
+C Add\sthe\sATOMIC_INTRINSICS\scompile-time\soutput\soutput.\s\sMove\ssqlite3Int.h\nin\sfront\sof\sctime.c\sso\sthat\sdefault\svalues\sthat\sare\snot\soverridden\sare\nshown\sin\sPRAGMA\scompile-time\soption\soutput.
+D 2021-07-05T18:37:37.729
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -491,7 +491,7 @@ F src/btreeInt.h 7bc15a24a02662409ebcd6aeaa1065522d14b7fda71573a2b0568b458f514ae
 F src/build.c ea28944f65b04f771e7aa5d614d406faa1bde5fe4ce882e2ead73049f03ed568
 F src/callback.c d0b853dd413255d2e337b34545e54d888ea02f20da5ad0e63585b389624c4a6c
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
-F src/ctime.c 3052b6b05ed9ef547a3dd66b8e01bfa9d582e78752ad6ed327da84652641e038
+F src/ctime.c 8159d5f706551861c18ec6c8f6bdf105e15ea00367f05d9ab65d31a1077facc1
 F src/date.c e0632f335952b32401482d099321bbf12716b29d6e72836b53ae49683ebae4bf
 F src/dbpage.c 8a01e865bf8bc6d7b1844b4314443a6436c07c3efe1d488ed89e81719047833a
 F src/dbstat.c 3aa79fc3aed7ce906e4ea6c10e85d657299e304f6049861fe300053ac57de36c
@@ -549,7 +549,7 @@ F src/shell.c.in 699910739eb7296fd47be19db71f6e5d15d0760f4352c62639d4d6cc7bd8d4c
 F src/sqlite.h.in ecf5aa981da30c33da3e9f353bf3ebf055d3c380c80d6a4f954e58d18ccd6df1
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h e97f4e9b509408fea4c4e9bef5a41608dfac343b4d3c7a990dedde1e19af9510
-F src/sqliteInt.h 72bdf367026290b4a631779127de4d50fc2b1b59066342beabaf80a11555aaf7
+F src/sqliteInt.h b5e0732368e4a4f925b7994538cd3fd3b85027a1c4dcadf3fc944b36f35ce8cd
 F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
 F src/status.c 4b8bc2a6905163a38b739854a35b826c737333fab5b1f8e03fa7eb9a4799c4c1
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@ -1846,7 +1846,7 @@ F tool/max-limits.c cbb635fbb37ae4d05f240bfb5b5270bb63c54439
 F tool/merge-test.tcl de76b62f2de2a92d4c1ca4f976bce0aea6899e0229e250479b229b2a1914b176
 F tool/mkautoconfamal.sh f62353eb6c06ab264da027fd4507d09914433dbdcab9cb011cdc18016f1ab3b8
 F tool/mkccode.tcl 86463e68ce9c15d3041610fedd285ce32a5cf7a58fc88b3202b8b76837650dbe x
-F tool/mkctimec.tcl 06b0d503ee0e6c2d4abe83563b43d4925a12e31ec9fb3249ce39661f53fbd1ce
+F tool/mkctimec.tcl 5ef1891ed3d0e8143ff39bad7c01ed60c2817a2fb2d9a09487f7ccad2df621e4
 F tool/mkkeywordhash.c 08b6e4d7a482a7f37a9a0032e7ba968e26624a027b6b2e9ba589be6f5e3d8c2c
 F tool/mkmsvcmin.tcl 6ecab9fe22c2c8de4d82d4c46797bda3d2deac8e763885f5a38d0c44a895ab33
 F tool/mkopcodec.tcl d1b6362bd3aa80d5520d4d6f3765badf01f6c43c
@@ -1857,7 +1857,7 @@ F tool/mkshellc.tcl 5fe7e518112b262e25726f248c0f33dd153192867453984b6af0a76a88e9
 F tool/mksourceid.c 36aa8020014aed0836fd13c51d6dc9219b0df1761d6b5f58ff5b616211b079b9
 F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
 F tool/mksqlite3c-noext.tcl 4f7cfef5152b0c91920355cbfc1d608a4ad242cb819f1aea07f6d0274f584a7f
-F tool/mksqlite3c.tcl 00c4c0382eb000153182da2bee2547ca05554eeeed10177efe5894c54e4e6d4d
+F tool/mksqlite3c.tcl b4a930a4c3f8f43273cde45a459eb8881479be3c2845526c92b2513a4995aab8
 F tool/mksqlite3h.tcl 1f5e4a1dbbbc43c83cc6e74fe32c6c620502240b66c7c0f33a51378e78fc4edf
 F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
 F tool/mkvsix.tcl b9e0777a213c23156b6542842c238479e496ebf5
@@ -1919,7 +1919,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 740cb43025449b7d7b47a97ad00885e54b7701cbcb14f4a50c7523022e3936d5
-R c38bc63b0e4c77ae43be3b1d873807d7
-U dan
-Z 5c6f4318a3def93e7f66935738dec11e
+P e690abb9e4e189c41182ac813115d55d811135013f5ce94ec0c45a547597f8ad
+R a2ccd00a396f9ce88779c0faa6b62ebe
+U drh
+Z bd5982e15977a466d333a20a1806f8f8

diff --git a/manifest.uuid b/manifest.uuid
index 646f20779625ceb1be12ddf37e7edaecedfb9cb9..0dacbe774840247eb0a8aafffd1ef6d17e959e7b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e690abb9e4e189c41182ac813115d55d811135013f5ce94ec0c45a547597f8ad
\ No newline at end of file
+e306952690bfb140e2c404a74b05ff2d070c487f7e52c62d62a004505fba0e15
\ No newline at end of file

diff --git a/src/ctime.c b/src/ctime.c
index fa69216c6d8aab0daadfefb116941b69e012d44c..de68ea7f5726dc9064ac820c0f2becd10ce9a76c 100644 (file)
--- a/src/ctime.c
+++ b/src/ctime.c
@@ -13,7 +13,6 @@
 ** This file implements routines used to report what compile-time options
 ** SQLite was built with.
 */
-
 #ifndef SQLITE_OMIT_COMPILEOPTION_DIAGS /* IMP: R-16824-07538 */
 
 /*
@@ -35,6 +34,7 @@
 ** comma. e.g. (-DSQLITE_DEFAULT_LOOKASIDE="100,100") */
 #define CTIMEOPT_VAL2_(opt1,opt2) #opt1 "," #opt2
 #define CTIMEOPT_VAL2(opt) CTIMEOPT_VAL2_(opt)
+#include "sqliteInt.h"
 
 /*
 ** An array of names of all compile-time options.  This array should 
@@ -49,13 +49,13 @@ static const char * const sqlite3azCompileOpt[] = {
 /* 
 ** BEGIN CODE GENERATED BY tool/mkctime.tcl 
 */
-#if SQLITE_32BIT_ROWID
+#ifdef SQLITE_32BIT_ROWID
   "32BIT_ROWID",
 #endif
-#if SQLITE_4_BYTE_ALIGNED_MALLOC
+#ifdef SQLITE_4_BYTE_ALIGNED_MALLOC
   "4_BYTE_ALIGNED_MALLOC",
 #endif
-#if SQLITE_64BIT_STATS
+#ifdef SQLITE_64BIT_STATS
   "64BIT_STATS",
 #endif
 #ifdef SQLITE_ALLOW_COVERING_INDEX_SCAN
@@ -63,19 +63,22 @@ static const char * const sqlite3azCompileOpt[] = {
   "ALLOW_COVERING_INDEX_SCAN=" CTIMEOPT_VAL(SQLITE_ALLOW_COVERING_INDEX_SCAN),
 # endif
 #endif
-#if SQLITE_ALLOW_URI_AUTHORITY
+#ifdef SQLITE_ALLOW_URI_AUTHORITY
   "ALLOW_URI_AUTHORITY",
 #endif
+#ifdef SQLITE_ATOMIC_INTRINSICS
+  "ATOMIC_INTRINSICS=" CTIMEOPT_VAL(SQLITE_ATOMIC_INTRINSICS),
+#endif
 #ifdef SQLITE_BITMASK_TYPE
   "BITMASK_TYPE=" CTIMEOPT_VAL(SQLITE_BITMASK_TYPE),
 #endif
-#if SQLITE_BUG_COMPATIBLE_20160819
+#ifdef SQLITE_BUG_COMPATIBLE_20160819
   "BUG_COMPATIBLE_20160819",
 #endif
-#if SQLITE_CASE_SENSITIVE_LIKE
+#ifdef SQLITE_CASE_SENSITIVE_LIKE
   "CASE_SENSITIVE_LIKE",
 #endif
-#if SQLITE_CHECK_PAGES
+#ifdef SQLITE_CHECK_PAGES
   "CHECK_PAGES",
 #endif
 #if defined(__clang__) && defined(__clang_major__)
@@ -87,22 +90,22 @@ static const char * const sqlite3azCompileOpt[] = {
 #elif defined(__GNUC__) && defined(__VERSION__)
   "COMPILER=gcc-" __VERSION__,
 #endif
-#if SQLITE_COVERAGE_TEST
+#ifdef SQLITE_COVERAGE_TEST
   "COVERAGE_TEST",
 #endif
-#if SQLITE_DEBUG
+#ifdef SQLITE_DEBUG
   "DEBUG",
 #endif
-#if SQLITE_DEFAULT_AUTOMATIC_INDEX
+#ifdef SQLITE_DEFAULT_AUTOMATIC_INDEX
   "DEFAULT_AUTOMATIC_INDEX",
 #endif
-#if SQLITE_DEFAULT_AUTOVACUUM
+#ifdef SQLITE_DEFAULT_AUTOVACUUM
   "DEFAULT_AUTOVACUUM",
 #endif
 #ifdef SQLITE_DEFAULT_CACHE_SIZE
   "DEFAULT_CACHE_SIZE=" CTIMEOPT_VAL(SQLITE_DEFAULT_CACHE_SIZE),
 #endif
-#if SQLITE_DEFAULT_CKPTFULLFSYNC
+#ifdef SQLITE_DEFAULT_CKPTFULLFSYNC
   "DEFAULT_CKPTFULLFSYNC",
 #endif
 #ifdef SQLITE_DEFAULT_FILE_FORMAT
@@ -111,7 +114,7 @@ static const char * const sqlite3azCompileOpt[] = {
 #ifdef SQLITE_DEFAULT_FILE_PERMISSIONS
   "DEFAULT_FILE_PERMISSIONS=" CTIMEOPT_VAL(SQLITE_DEFAULT_FILE_PERMISSIONS),
 #endif
-#if SQLITE_DEFAULT_FOREIGN_KEYS
+#ifdef SQLITE_DEFAULT_FOREIGN_KEYS
   "DEFAULT_FOREIGN_KEYS",
 #endif
 #ifdef SQLITE_DEFAULT_JOURNAL_SIZE_LIMIT
@@ -140,7 +143,7 @@ static const char * const sqlite3azCompileOpt[] = {
 #ifdef SQLITE_DEFAULT_PROXYDIR_PERMISSIONS
   "DEFAULT_PROXYDIR_PERMISSIONS=" CTIMEOPT_VAL(SQLITE_DEFAULT_PROXYDIR_PERMISSIONS),
 #endif
-#if SQLITE_DEFAULT_RECURSIVE_TRIGGERS
+#ifdef SQLITE_DEFAULT_RECURSIVE_TRIGGERS
   "DEFAULT_RECURSIVE_TRIGGERS",
 #endif
 #ifdef SQLITE_DEFAULT_ROWEST
@@ -161,196 +164,196 @@ static const char * const sqlite3azCompileOpt[] = {
 #ifdef SQLITE_DEFAULT_WORKER_THREADS
   "DEFAULT_WORKER_THREADS=" CTIMEOPT_VAL(SQLITE_DEFAULT_WORKER_THREADS),
 #endif
-#if SQLITE_DIRECT_OVERFLOW_READ
+#ifdef SQLITE_DIRECT_OVERFLOW_READ
   "DIRECT_OVERFLOW_READ",
 #endif
-#if SQLITE_DISABLE_DIRSYNC
+#ifdef SQLITE_DISABLE_DIRSYNC
   "DISABLE_DIRSYNC",
 #endif
-#if SQLITE_DISABLE_FTS3_UNICODE
+#ifdef SQLITE_DISABLE_FTS3_UNICODE
   "DISABLE_FTS3_UNICODE",
 #endif
-#if SQLITE_DISABLE_FTS4_DEFERRED
+#ifdef SQLITE_DISABLE_FTS4_DEFERRED
   "DISABLE_FTS4_DEFERRED",
 #endif
-#if SQLITE_DISABLE_INTRINSIC
+#ifdef SQLITE_DISABLE_INTRINSIC
   "DISABLE_INTRINSIC",
 #endif
-#if SQLITE_DISABLE_LFS
+#ifdef SQLITE_DISABLE_LFS
   "DISABLE_LFS",
 #endif
-#if SQLITE_DISABLE_PAGECACHE_OVERFLOW_STATS
+#ifdef SQLITE_DISABLE_PAGECACHE_OVERFLOW_STATS
   "DISABLE_PAGECACHE_OVERFLOW_STATS",
 #endif
-#if SQLITE_DISABLE_SKIPAHEAD_DISTINCT
+#ifdef SQLITE_DISABLE_SKIPAHEAD_DISTINCT
   "DISABLE_SKIPAHEAD_DISTINCT",
 #endif
 #ifdef SQLITE_ENABLE_8_3_NAMES
   "ENABLE_8_3_NAMES=" CTIMEOPT_VAL(SQLITE_ENABLE_8_3_NAMES),
 #endif
-#if SQLITE_ENABLE_API_ARMOR
+#ifdef SQLITE_ENABLE_API_ARMOR
   "ENABLE_API_ARMOR",
 #endif
-#if SQLITE_ENABLE_ATOMIC_WRITE
+#ifdef SQLITE_ENABLE_ATOMIC_WRITE
   "ENABLE_ATOMIC_WRITE",
 #endif
-#if SQLITE_ENABLE_BATCH_ATOMIC_WRITE
+#ifdef SQLITE_ENABLE_BATCH_ATOMIC_WRITE
   "ENABLE_BATCH_ATOMIC_WRITE",
 #endif
-#if SQLITE_ENABLE_BYTECODE_VTAB
+#ifdef SQLITE_ENABLE_BYTECODE_VTAB
   "ENABLE_BYTECODE_VTAB",
 #endif
 #ifdef SQLITE_ENABLE_CEROD
   "ENABLE_CEROD=" CTIMEOPT_VAL(SQLITE_ENABLE_CEROD),
 #endif
-#if SQLITE_ENABLE_COLUMN_METADATA
+#ifdef SQLITE_ENABLE_COLUMN_METADATA
   "ENABLE_COLUMN_METADATA",
 #endif
-#if SQLITE_ENABLE_COLUMN_USED_MASK
+#ifdef SQLITE_ENABLE_COLUMN_USED_MASK
   "ENABLE_COLUMN_USED_MASK",
 #endif
-#if SQLITE_ENABLE_COSTMULT
+#ifdef SQLITE_ENABLE_COSTMULT
   "ENABLE_COSTMULT",
 #endif
-#if SQLITE_ENABLE_CURSOR_HINTS
+#ifdef SQLITE_ENABLE_CURSOR_HINTS
   "ENABLE_CURSOR_HINTS",
 #endif
-#if SQLITE_ENABLE_DBPAGE_VTAB
+#ifdef SQLITE_ENABLE_DBPAGE_VTAB
   "ENABLE_DBPAGE_VTAB",
 #endif
-#if SQLITE_ENABLE_DBSTAT_VTAB
+#ifdef SQLITE_ENABLE_DBSTAT_VTAB
   "ENABLE_DBSTAT_VTAB",
 #endif
-#if SQLITE_ENABLE_EXPENSIVE_ASSERT
+#ifdef SQLITE_ENABLE_EXPENSIVE_ASSERT
   "ENABLE_EXPENSIVE_ASSERT",
 #endif
-#if SQLITE_ENABLE_EXPLAIN_COMMENTS
+#ifdef SQLITE_ENABLE_EXPLAIN_COMMENTS
   "ENABLE_EXPLAIN_COMMENTS",
 #endif
-#if SQLITE_ENABLE_FTS3
+#ifdef SQLITE_ENABLE_FTS3
   "ENABLE_FTS3",
 #endif
-#if SQLITE_ENABLE_FTS3_PARENTHESIS
+#ifdef SQLITE_ENABLE_FTS3_PARENTHESIS
   "ENABLE_FTS3_PARENTHESIS",
 #endif
-#if SQLITE_ENABLE_FTS3_TOKENIZER
+#ifdef SQLITE_ENABLE_FTS3_TOKENIZER
   "ENABLE_FTS3_TOKENIZER",
 #endif
-#if SQLITE_ENABLE_FTS4
+#ifdef SQLITE_ENABLE_FTS4
   "ENABLE_FTS4",
 #endif
-#if SQLITE_ENABLE_FTS5
+#ifdef SQLITE_ENABLE_FTS5
   "ENABLE_FTS5",
 #endif
-#if SQLITE_ENABLE_GEOPOLY
+#ifdef SQLITE_ENABLE_GEOPOLY
   "ENABLE_GEOPOLY",
 #endif
-#if SQLITE_ENABLE_HIDDEN_COLUMNS
+#ifdef SQLITE_ENABLE_HIDDEN_COLUMNS
   "ENABLE_HIDDEN_COLUMNS",
 #endif
-#if SQLITE_ENABLE_ICU
+#ifdef SQLITE_ENABLE_ICU
   "ENABLE_ICU",
 #endif
-#if SQLITE_ENABLE_IOTRACE
+#ifdef SQLITE_ENABLE_IOTRACE
   "ENABLE_IOTRACE",
 #endif
-#if SQLITE_ENABLE_JSON1
+#ifdef SQLITE_ENABLE_JSON1
   "ENABLE_JSON1",
 #endif
-#if SQLITE_ENABLE_LOAD_EXTENSION
+#ifdef SQLITE_ENABLE_LOAD_EXTENSION
   "ENABLE_LOAD_EXTENSION",
 #endif
 #ifdef SQLITE_ENABLE_LOCKING_STYLE
   "ENABLE_LOCKING_STYLE=" CTIMEOPT_VAL(SQLITE_ENABLE_LOCKING_STYLE),
 #endif
-#if SQLITE_ENABLE_MATH_FUNCTIONS
+#ifdef SQLITE_ENABLE_MATH_FUNCTIONS
   "ENABLE_MATH_FUNCTIONS",
 #endif
-#if SQLITE_ENABLE_MEMORY_MANAGEMENT
+#ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT
   "ENABLE_MEMORY_MANAGEMENT",
 #endif
-#if SQLITE_ENABLE_MEMSYS3
+#ifdef SQLITE_ENABLE_MEMSYS3
   "ENABLE_MEMSYS3",
 #endif
-#if SQLITE_ENABLE_MEMSYS5
+#ifdef SQLITE_ENABLE_MEMSYS5
   "ENABLE_MEMSYS5",
 #endif
-#if SQLITE_ENABLE_MULTIPLEX
+#ifdef SQLITE_ENABLE_MULTIPLEX
   "ENABLE_MULTIPLEX",
 #endif
-#if SQLITE_ENABLE_NORMALIZE
+#ifdef SQLITE_ENABLE_NORMALIZE
   "ENABLE_NORMALIZE",
 #endif
-#if SQLITE_ENABLE_NULL_TRIM
+#ifdef SQLITE_ENABLE_NULL_TRIM
   "ENABLE_NULL_TRIM",
 #endif
-#if SQLITE_ENABLE_OFFSET_SQL_FUNC
+#ifdef SQLITE_ENABLE_OFFSET_SQL_FUNC
   "ENABLE_OFFSET_SQL_FUNC",
 #endif
-#if SQLITE_ENABLE_OVERSIZE_CELL_CHECK
+#ifdef SQLITE_ENABLE_OVERSIZE_CELL_CHECK
   "ENABLE_OVERSIZE_CELL_CHECK",
 #endif
-#if SQLITE_ENABLE_PREUPDATE_HOOK
+#ifdef SQLITE_ENABLE_PREUPDATE_HOOK
   "ENABLE_PREUPDATE_HOOK",
 #endif
-#if SQLITE_ENABLE_QPSG
+#ifdef SQLITE_ENABLE_QPSG
   "ENABLE_QPSG",
 #endif
-#if SQLITE_ENABLE_RBU
+#ifdef SQLITE_ENABLE_RBU
   "ENABLE_RBU",
 #endif
-#if SQLITE_ENABLE_RTREE
+#ifdef SQLITE_ENABLE_RTREE
   "ENABLE_RTREE",
 #endif
-#if SQLITE_ENABLE_SELECTTRACE
+#ifdef SQLITE_ENABLE_SELECTTRACE
   "ENABLE_SELECTTRACE",
 #endif
-#if SQLITE_ENABLE_SESSION
+#ifdef SQLITE_ENABLE_SESSION
   "ENABLE_SESSION",
 #endif
-#if SQLITE_ENABLE_SNAPSHOT
+#ifdef SQLITE_ENABLE_SNAPSHOT
   "ENABLE_SNAPSHOT",
 #endif
-#if SQLITE_ENABLE_SORTER_REFERENCES
+#ifdef SQLITE_ENABLE_SORTER_REFERENCES
   "ENABLE_SORTER_REFERENCES",
 #endif
-#if SQLITE_ENABLE_SQLLOG
+#ifdef SQLITE_ENABLE_SQLLOG
   "ENABLE_SQLLOG",
 #endif
-#if SQLITE_ENABLE_STAT4
+#ifdef SQLITE_ENABLE_STAT4
   "ENABLE_STAT4",
 #endif
-#if SQLITE_ENABLE_STMTVTAB
+#ifdef SQLITE_ENABLE_STMTVTAB
   "ENABLE_STMTVTAB",
 #endif
-#if SQLITE_ENABLE_STMT_SCANSTATUS
+#ifdef SQLITE_ENABLE_STMT_SCANSTATUS
   "ENABLE_STMT_SCANSTATUS",
 #endif
-#if SQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
+#ifdef SQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
   "ENABLE_UNKNOWN_SQL_FUNCTION",
 #endif
-#if SQLITE_ENABLE_UNLOCK_NOTIFY
+#ifdef SQLITE_ENABLE_UNLOCK_NOTIFY
   "ENABLE_UNLOCK_NOTIFY",
 #endif
-#if SQLITE_ENABLE_UPDATE_DELETE_LIMIT
+#ifdef SQLITE_ENABLE_UPDATE_DELETE_LIMIT
   "ENABLE_UPDATE_DELETE_LIMIT",
 #endif
-#if SQLITE_ENABLE_URI_00_ERROR
+#ifdef SQLITE_ENABLE_URI_00_ERROR
   "ENABLE_URI_00_ERROR",
 #endif
-#if SQLITE_ENABLE_VFSTRACE
+#ifdef SQLITE_ENABLE_VFSTRACE
   "ENABLE_VFSTRACE",
 #endif
-#if SQLITE_ENABLE_WHERETRACE
+#ifdef SQLITE_ENABLE_WHERETRACE
   "ENABLE_WHERETRACE",
 #endif
-#if SQLITE_ENABLE_ZIPVFS
+#ifdef SQLITE_ENABLE_ZIPVFS
   "ENABLE_ZIPVFS",
 #endif
-#if SQLITE_EXPLAIN_ESTIMATED_ROWS
+#ifdef SQLITE_EXPLAIN_ESTIMATED_ROWS
   "EXPLAIN_ESTIMATED_ROWS",
 #endif
-#if SQLITE_EXTRA_IFNULLROW
+#ifdef SQLITE_EXTRA_IFNULLROW
   "EXTRA_IFNULLROW",
 #endif
 #ifdef SQLITE_EXTRA_INIT
@@ -362,10 +365,10 @@ static const char * const sqlite3azCompileOpt[] = {
 #ifdef SQLITE_FTS3_MAX_EXPR_DEPTH
   "FTS3_MAX_EXPR_DEPTH=" CTIMEOPT_VAL(SQLITE_FTS3_MAX_EXPR_DEPTH),
 #endif
-#if SQLITE_FTS5_ENABLE_TEST_MI
+#ifdef SQLITE_FTS5_ENABLE_TEST_MI
   "FTS5_ENABLE_TEST_MI",
 #endif
-#if SQLITE_FTS5_NO_WITHOUT_ROWID
+#ifdef SQLITE_FTS5_NO_WITHOUT_ROWID
   "FTS5_NO_WITHOUT_ROWID",
 #endif
 #if HAVE_ISNAN || SQLITE_HAVE_ISNAN
@@ -376,28 +379,28 @@ static const char * const sqlite3azCompileOpt[] = {
   "HOMEGROWN_RECURSIVE_MUTEX=" CTIMEOPT_VAL(SQLITE_HOMEGROWN_RECURSIVE_MUTEX),
 # endif
 #endif
-#if SQLITE_IGNORE_AFP_LOCK_ERRORS
+#ifdef SQLITE_IGNORE_AFP_LOCK_ERRORS
   "IGNORE_AFP_LOCK_ERRORS",
 #endif
-#if SQLITE_IGNORE_FLOCK_LOCK_ERRORS
+#ifdef SQLITE_IGNORE_FLOCK_LOCK_ERRORS
   "IGNORE_FLOCK_LOCK_ERRORS",
 #endif
-#if SQLITE_INLINE_MEMCPY
+#ifdef SQLITE_INLINE_MEMCPY
   "INLINE_MEMCPY",
 #endif
-#if SQLITE_INT64_TYPE
+#ifdef SQLITE_INT64_TYPE
   "INT64_TYPE",
 #endif
 #ifdef SQLITE_INTEGRITY_CHECK_ERROR_MAX
   "INTEGRITY_CHECK_ERROR_MAX=" CTIMEOPT_VAL(SQLITE_INTEGRITY_CHECK_ERROR_MAX),
 #endif
-#if SQLITE_LIKE_DOESNT_MATCH_BLOBS
+#ifdef SQLITE_LIKE_DOESNT_MATCH_BLOBS
   "LIKE_DOESNT_MATCH_BLOBS",
 #endif
-#if SQLITE_LOCK_TRACE
+#ifdef SQLITE_LOCK_TRACE
   "LOCK_TRACE",
 #endif
-#if SQLITE_LOG_CACHE_SPILL
+#ifdef SQLITE_LOG_CACHE_SPILL
   "LOG_CACHE_SPILL",
 #endif
 #ifdef SQLITE_MALLOC_SOFT_LIMIT
@@ -460,190 +463,187 @@ static const char * const sqlite3azCompileOpt[] = {
 #ifdef SQLITE_MAX_WORKER_THREADS
   "MAX_WORKER_THREADS=" CTIMEOPT_VAL(SQLITE_MAX_WORKER_THREADS),
 #endif
-#if SQLITE_MEMDEBUG
+#ifdef SQLITE_MEMDEBUG
   "MEMDEBUG",
 #endif
-#if SQLITE_MIXED_ENDIAN_64BIT_FLOAT
+#ifdef SQLITE_MIXED_ENDIAN_64BIT_FLOAT
   "MIXED_ENDIAN_64BIT_FLOAT",
 #endif
-#if SQLITE_MMAP_READWRITE
+#ifdef SQLITE_MMAP_READWRITE
   "MMAP_READWRITE",
 #endif
-#if SQLITE_MUTEX_NOOP
+#ifdef SQLITE_MUTEX_NOOP
   "MUTEX_NOOP",
 #endif
-#if SQLITE_MUTEX_OMIT
+#ifdef SQLITE_MUTEX_OMIT
   "MUTEX_OMIT",
 #endif
-#if SQLITE_MUTEX_PTHREADS
+#ifdef SQLITE_MUTEX_PTHREADS
   "MUTEX_PTHREADS",
 #endif
-#if SQLITE_MUTEX_W32
+#ifdef SQLITE_MUTEX_W32
   "MUTEX_W32",
 #endif
-#if SQLITE_NEED_ERR_NAME
+#ifdef SQLITE_NEED_ERR_NAME
   "NEED_ERR_NAME",
 #endif
-#if SQLITE_NOINLINE
-  "NOINLINE",
-#endif
-#if SQLITE_NO_SYNC
+#ifdef SQLITE_NO_SYNC
   "NO_SYNC",
 #endif
-#if SQLITE_OMIT_ALTERTABLE
+#ifdef SQLITE_OMIT_ALTERTABLE
   "OMIT_ALTERTABLE",
 #endif
-#if SQLITE_OMIT_ANALYZE
+#ifdef SQLITE_OMIT_ANALYZE
   "OMIT_ANALYZE",
 #endif
-#if SQLITE_OMIT_ATTACH
+#ifdef SQLITE_OMIT_ATTACH
   "OMIT_ATTACH",
 #endif
-#if SQLITE_OMIT_AUTHORIZATION
+#ifdef SQLITE_OMIT_AUTHORIZATION
   "OMIT_AUTHORIZATION",
 #endif
-#if SQLITE_OMIT_AUTOINCREMENT
+#ifdef SQLITE_OMIT_AUTOINCREMENT
   "OMIT_AUTOINCREMENT",
 #endif
-#if SQLITE_OMIT_AUTOINIT
+#ifdef SQLITE_OMIT_AUTOINIT
   "OMIT_AUTOINIT",
 #endif
-#if SQLITE_OMIT_AUTOMATIC_INDEX
+#ifdef SQLITE_OMIT_AUTOMATIC_INDEX
   "OMIT_AUTOMATIC_INDEX",
 #endif
-#if SQLITE_OMIT_AUTORESET
+#ifdef SQLITE_OMIT_AUTORESET
   "OMIT_AUTORESET",
 #endif
-#if SQLITE_OMIT_AUTOVACUUM
+#ifdef SQLITE_OMIT_AUTOVACUUM
   "OMIT_AUTOVACUUM",
 #endif
-#if SQLITE_OMIT_BETWEEN_OPTIMIZATION
+#ifdef SQLITE_OMIT_BETWEEN_OPTIMIZATION
   "OMIT_BETWEEN_OPTIMIZATION",
 #endif
-#if SQLITE_OMIT_BLOB_LITERAL
+#ifdef SQLITE_OMIT_BLOB_LITERAL
   "OMIT_BLOB_LITERAL",
 #endif
-#if SQLITE_OMIT_CAST
+#ifdef SQLITE_OMIT_CAST
   "OMIT_CAST",
 #endif
-#if SQLITE_OMIT_CHECK
+#ifdef SQLITE_OMIT_CHECK
   "OMIT_CHECK",
 #endif
-#if SQLITE_OMIT_COMPLETE
+#ifdef SQLITE_OMIT_COMPLETE
   "OMIT_COMPLETE",
 #endif
-#if SQLITE_OMIT_COMPOUND_SELECT
+#ifdef SQLITE_OMIT_COMPOUND_SELECT
   "OMIT_COMPOUND_SELECT",
 #endif
-#if SQLITE_OMIT_CONFLICT_CLAUSE
+#ifdef SQLITE_OMIT_CONFLICT_CLAUSE
   "OMIT_CONFLICT_CLAUSE",
 #endif
-#if SQLITE_OMIT_CTE
+#ifdef SQLITE_OMIT_CTE
   "OMIT_CTE",
 #endif
 #if defined(SQLITE_OMIT_DATETIME_FUNCS) || defined(SQLITE_OMIT_FLOATING_POINT)
   "OMIT_DATETIME_FUNCS",
 #endif
-#if SQLITE_OMIT_DECLTYPE
+#ifdef SQLITE_OMIT_DECLTYPE
   "OMIT_DECLTYPE",
 #endif
-#if SQLITE_OMIT_DEPRECATED
+#ifdef SQLITE_OMIT_DEPRECATED
   "OMIT_DEPRECATED",
 #endif
-#if SQLITE_OMIT_DESERIALIZE
+#ifdef SQLITE_OMIT_DESERIALIZE
   "OMIT_DESERIALIZE",
 #endif
-#if SQLITE_OMIT_DISKIO
+#ifdef SQLITE_OMIT_DISKIO
   "OMIT_DISKIO",
 #endif
-#if SQLITE_OMIT_EXPLAIN
+#ifdef SQLITE_OMIT_EXPLAIN
   "OMIT_EXPLAIN",
 #endif
-#if SQLITE_OMIT_FLAG_PRAGMAS
+#ifdef SQLITE_OMIT_FLAG_PRAGMAS
   "OMIT_FLAG_PRAGMAS",
 #endif
-#if SQLITE_OMIT_FLOATING_POINT
+#ifdef SQLITE_OMIT_FLOATING_POINT
   "OMIT_FLOATING_POINT",
 #endif
-#if SQLITE_OMIT_FOREIGN_KEY
+#ifdef SQLITE_OMIT_FOREIGN_KEY
   "OMIT_FOREIGN_KEY",
 #endif
-#if SQLITE_OMIT_GET_TABLE
+#ifdef SQLITE_OMIT_GET_TABLE
   "OMIT_GET_TABLE",
 #endif
-#if SQLITE_OMIT_HEX_INTEGER
+#ifdef SQLITE_OMIT_HEX_INTEGER
   "OMIT_HEX_INTEGER",
 #endif
-#if SQLITE_OMIT_INCRBLOB
+#ifdef SQLITE_OMIT_INCRBLOB
   "OMIT_INCRBLOB",
 #endif
-#if SQLITE_OMIT_INTEGRITY_CHECK
+#ifdef SQLITE_OMIT_INTEGRITY_CHECK
   "OMIT_INTEGRITY_CHECK",
 #endif
-#if SQLITE_OMIT_INTROSPECTION_PRAGMAS
+#ifdef SQLITE_OMIT_INTROSPECTION_PRAGMAS
   "OMIT_INTROSPECTION_PRAGMAS",
 #endif
-#if SQLITE_OMIT_LIKE_OPTIMIZATION
+#ifdef SQLITE_OMIT_LIKE_OPTIMIZATION
   "OMIT_LIKE_OPTIMIZATION",
 #endif
-#if SQLITE_OMIT_LOAD_EXTENSION
+#ifdef SQLITE_OMIT_LOAD_EXTENSION
   "OMIT_LOAD_EXTENSION",
 #endif
-#if SQLITE_OMIT_LOCALTIME
+#ifdef SQLITE_OMIT_LOCALTIME
   "OMIT_LOCALTIME",
 #endif
-#if SQLITE_OMIT_LOOKASIDE
+#ifdef SQLITE_OMIT_LOOKASIDE
   "OMIT_LOOKASIDE",
 #endif
-#if SQLITE_OMIT_MEMORYDB
+#ifdef SQLITE_OMIT_MEMORYDB
   "OMIT_MEMORYDB",
 #endif
-#if SQLITE_OMIT_OR_OPTIMIZATION
+#ifdef SQLITE_OMIT_OR_OPTIMIZATION
   "OMIT_OR_OPTIMIZATION",
 #endif
-#if SQLITE_OMIT_PAGER_PRAGMAS
+#ifdef SQLITE_OMIT_PAGER_PRAGMAS
   "OMIT_PAGER_PRAGMAS",
 #endif
-#if SQLITE_OMIT_PARSER_TRACE
+#ifdef SQLITE_OMIT_PARSER_TRACE
   "OMIT_PARSER_TRACE",
 #endif
-#if SQLITE_OMIT_POPEN
+#ifdef SQLITE_OMIT_POPEN
   "OMIT_POPEN",
 #endif
-#if SQLITE_OMIT_PRAGMA
+#ifdef SQLITE_OMIT_PRAGMA
   "OMIT_PRAGMA",
 #endif
-#if SQLITE_OMIT_PROGRESS_CALLBACK
+#ifdef SQLITE_OMIT_PROGRESS_CALLBACK
   "OMIT_PROGRESS_CALLBACK",
 #endif
-#if SQLITE_OMIT_QUICKBALANCE
+#ifdef SQLITE_OMIT_QUICKBALANCE
   "OMIT_QUICKBALANCE",
 #endif
-#if SQLITE_OMIT_REINDEX
+#ifdef SQLITE_OMIT_REINDEX
   "OMIT_REINDEX",
 #endif
-#if SQLITE_OMIT_SCHEMA_PRAGMAS
+#ifdef SQLITE_OMIT_SCHEMA_PRAGMAS
   "OMIT_SCHEMA_PRAGMAS",
 #endif
-#if SQLITE_OMIT_SCHEMA_VERSION_PRAGMAS
+#ifdef SQLITE_OMIT_SCHEMA_VERSION_PRAGMAS
   "OMIT_SCHEMA_VERSION_PRAGMAS",
 #endif
-#if SQLITE_OMIT_SHARED_CACHE
+#ifdef SQLITE_OMIT_SHARED_CACHE
   "OMIT_SHARED_CACHE",
 #endif
-#if SQLITE_OMIT_SHUTDOWN_DIRECTORIES
+#ifdef SQLITE_OMIT_SHUTDOWN_DIRECTORIES
   "OMIT_SHUTDOWN_DIRECTORIES",
 #endif
-#if SQLITE_OMIT_SUBQUERY
+#ifdef SQLITE_OMIT_SUBQUERY
   "OMIT_SUBQUERY",
 #endif
-#if SQLITE_OMIT_TCL_VARIABLE
+#ifdef SQLITE_OMIT_TCL_VARIABLE
   "OMIT_TCL_VARIABLE",
 #endif
-#if SQLITE_OMIT_TEMPDB
+#ifdef SQLITE_OMIT_TEMPDB
   "OMIT_TEMPDB",
 #endif
-#if SQLITE_OMIT_TEST_CONTROL
+#ifdef SQLITE_OMIT_TEST_CONTROL
   "OMIT_TEST_CONTROL",
 #endif
 #ifdef SQLITE_OMIT_TRACE
@@ -651,37 +651,37 @@ static const char * const sqlite3azCompileOpt[] = {
   "OMIT_TRACE=" CTIMEOPT_VAL(SQLITE_OMIT_TRACE),
 # endif
 #endif
-#if SQLITE_OMIT_TRIGGER
+#ifdef SQLITE_OMIT_TRIGGER
   "OMIT_TRIGGER",
 #endif
-#if SQLITE_OMIT_TRUNCATE_OPTIMIZATION
+#ifdef SQLITE_OMIT_TRUNCATE_OPTIMIZATION
   "OMIT_TRUNCATE_OPTIMIZATION",
 #endif
-#if SQLITE_OMIT_UTF16
+#ifdef SQLITE_OMIT_UTF16
   "OMIT_UTF16",
 #endif
-#if SQLITE_OMIT_VACUUM
+#ifdef SQLITE_OMIT_VACUUM
   "OMIT_VACUUM",
 #endif
-#if SQLITE_OMIT_VIEW
+#ifdef SQLITE_OMIT_VIEW
   "OMIT_VIEW",
 #endif
-#if SQLITE_OMIT_VIRTUALTABLE
+#ifdef SQLITE_OMIT_VIRTUALTABLE
   "OMIT_VIRTUALTABLE",
 #endif
-#if SQLITE_OMIT_WAL
+#ifdef SQLITE_OMIT_WAL
   "OMIT_WAL",
 #endif
-#if SQLITE_OMIT_WSD
+#ifdef SQLITE_OMIT_WSD
   "OMIT_WSD",
 #endif
-#if SQLITE_OMIT_XFER_OPT
+#ifdef SQLITE_OMIT_XFER_OPT
   "OMIT_XFER_OPT",
 #endif
-#if SQLITE_PCACHE_SEPARATE_HEADER
+#ifdef SQLITE_PCACHE_SEPARATE_HEADER
   "PCACHE_SEPARATE_HEADER",
 #endif
-#if SQLITE_PERFORMANCE_TRACE
+#ifdef SQLITE_PERFORMANCE_TRACE
   "PERFORMANCE_TRACE",
 #endif
 #ifdef SQLITE_POWERSAFE_OVERWRITE
@@ -689,28 +689,28 @@ static const char * const sqlite3azCompileOpt[] = {
   "POWERSAFE_OVERWRITE=" CTIMEOPT_VAL(SQLITE_POWERSAFE_OVERWRITE),
 # endif
 #endif
-#if SQLITE_PREFER_PROXY_LOCKING
+#ifdef SQLITE_PREFER_PROXY_LOCKING
   "PREFER_PROXY_LOCKING",
 #endif
-#if SQLITE_PROXY_DEBUG
+#ifdef SQLITE_PROXY_DEBUG
   "PROXY_DEBUG",
 #endif
-#if SQLITE_REVERSE_UNORDERED_SELECTS
+#ifdef SQLITE_REVERSE_UNORDERED_SELECTS
   "REVERSE_UNORDERED_SELECTS",
 #endif
-#if SQLITE_RTREE_INT_ONLY
+#ifdef SQLITE_RTREE_INT_ONLY
   "RTREE_INT_ONLY",
 #endif
-#if SQLITE_SECURE_DELETE
+#ifdef SQLITE_SECURE_DELETE
   "SECURE_DELETE",
 #endif
-#if SQLITE_SMALL_STACK
+#ifdef SQLITE_SMALL_STACK
   "SMALL_STACK",
 #endif
 #ifdef SQLITE_SORTER_PMASZ
   "SORTER_PMASZ=" CTIMEOPT_VAL(SQLITE_SORTER_PMASZ),
 #endif
-#if SQLITE_SOUNDEX
+#ifdef SQLITE_SOUNDEX
   "SOUNDEX",
 #endif
 #ifdef SQLITE_STAT4_SAMPLES
@@ -719,7 +719,7 @@ static const char * const sqlite3azCompileOpt[] = {
 #ifdef SQLITE_STMTJRNL_SPILL
   "STMTJRNL_SPILL=" CTIMEOPT_VAL(SQLITE_STMTJRNL_SPILL),
 #endif
-#if SQLITE_SUBSTR_COMPATIBILITY
+#ifdef SQLITE_SUBSTR_COMPATIBILITY
   "SUBSTR_COMPATIBILITY",
 #endif
 #if (!defined(SQLITE_WIN32_MALLOC) \
@@ -728,13 +728,13 @@ static const char * const sqlite3azCompileOpt[] = {
     ) || defined(SQLITE_SYSTEM_MALLOC)
   "SYSTEM_MALLOC",
 #endif
-#if SQLITE_TCL
+#ifdef SQLITE_TCL
   "TCL",
 #endif
 #ifdef SQLITE_TEMP_STORE
   "TEMP_STORE=" CTIMEOPT_VAL(SQLITE_TEMP_STORE),
 #endif
-#if SQLITE_TEST
+#ifdef SQLITE_TEST
   "TEST",
 #endif
 #if defined(SQLITE_THREADSAFE)
@@ -744,31 +744,31 @@ static const char * const sqlite3azCompileOpt[] = {
 #else
   "THREADSAFE=1",
 #endif
-#if SQLITE_UNLINK_AFTER_CLOSE
+#ifdef SQLITE_UNLINK_AFTER_CLOSE
   "UNLINK_AFTER_CLOSE",
 #endif
-#if SQLITE_UNTESTABLE
+#ifdef SQLITE_UNTESTABLE
   "UNTESTABLE",
 #endif
-#if SQLITE_USER_AUTHENTICATION
+#ifdef SQLITE_USER_AUTHENTICATION
   "USER_AUTHENTICATION",
 #endif
-#if SQLITE_USE_ALLOCA
+#ifdef SQLITE_USE_ALLOCA
   "USE_ALLOCA",
 #endif
-#if SQLITE_USE_FCNTL_TRACE
+#ifdef SQLITE_USE_FCNTL_TRACE
   "USE_FCNTL_TRACE",
 #endif
-#if SQLITE_USE_URI
+#ifdef SQLITE_USE_URI
   "USE_URI",
 #endif
-#if SQLITE_VDBE_COVERAGE
+#ifdef SQLITE_VDBE_COVERAGE
   "VDBE_COVERAGE",
 #endif
-#if SQLITE_WIN32_MALLOC
+#ifdef SQLITE_WIN32_MALLOC
   "WIN32_MALLOC",
 #endif
-#if SQLITE_ZERO_MALLOC
+#ifdef SQLITE_ZERO_MALLOC
   "ZERO_MALLOC",
 #endif
 /* 

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 442128adca9ec5002f2ccef225186d2c85fecef4..23eccd8fcb4952e6daea271fe1d97a5184cfb444 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -215,9 +215,11 @@
 # define __has_extension(x) 0     /* compatibility with non-clang compilers */
 #endif
 #if GCC_VERSION>=4007000 || __has_extension(c_atomic) 
+# define SQLITE_ATOMIC_INTRINSICS 1
 # define AtomicLoad(PTR)       __atomic_load_n((PTR),__ATOMIC_RELAXED)
 # define AtomicStore(PTR,VAL)  __atomic_store_n((PTR),(VAL),__ATOMIC_RELAXED)
 #else
+# define SQLITE_ATOMIC_INTRINSICS 0
 # define AtomicLoad(PTR)       (*(PTR))
 # define AtomicStore(PTR,VAL)  (*(PTR) = (VAL))
 #endif

diff --git a/tool/mkctimec.tcl b/tool/mkctimec.tcl
index 2f15ac9fb7ce9e69027adbb5bbbe6d3202028974..6294609451d9d51e9a6fa825ce25db25e41b39d7 100644 (file)
--- a/tool/mkctimec.tcl
+++ b/tool/mkctimec.tcl
@@ -120,7 +120,6 @@ set boolean_defnil_options {
   SQLITE_MUTEX_PTHREADS
   SQLITE_MUTEX_W32
   SQLITE_NEED_ERR_NAME
-  SQLITE_NOINLINE
   SQLITE_NO_SYNC
   SQLITE_OMIT_ALTERTABLE
   SQLITE_OMIT_ANALYZE
@@ -216,6 +215,7 @@ set value2_options {
 # and is a single scalar.
 #
 set value_options {
+  SQLITE_ATOMIC_INTRINSICS
   SQLITE_BITMASK_TYPE
   SQLITE_DEFAULT_CACHE_SIZE
   SQLITE_DEFAULT_FILE_FORMAT
@@ -330,7 +330,7 @@ foreach name_defval $boolean_defnnz_options {
 foreach b $boolean_defnil_options {
   set name [trim_name $b]
   set options($name) [subst {
-#if $b
+#ifdef $b
   "$name",
 #endif
 }]

diff --git a/tool/mksqlite3c.tcl b/tool/mksqlite3c.tcl
index 41cf8aa95c8ea8c07f5ec81934eede100d66a53b..054e0fd1b9a659228a100d443c06eae4e76ec0b6 100644 (file)
--- a/tool/mksqlite3c.tcl
+++ b/tool/mksqlite3c.tcl
@@ -303,8 +303,8 @@ proc copy_file {filename} {
 # inlining opportunities.
 #
 foreach file {
-   ctime.c
    sqliteInt.h
+   ctime.c
 
    global.c
    status.c