From: drh Date: Wed, 9 Nov 2016 00:57:27 +0000 (+0000) Subject: Remove the "experimental" marking from the sqlite3_preupdate interfaces. X-Git-Tag: version-3.16.0~139 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7723371eb71285deeea5cb244abf66cd25dc0884;p=thirdparty%2Fsqlite.git Remove the "experimental" marking from the sqlite3_preupdate interfaces. But be sure all the interface definitions are within documentation. FossilOrigin-Name: d6dd2ad35ed17e980ed564688499c802e5850386 --- diff --git a/manifest b/manifest index 9c94df9efd..7c318efe4e 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Avoid\ssuperfluous\scursor\sseeks\sin\s"INSERT\sOR\sREPLACE"\sstatements. -D 2016-11-08T19:22:32.125 +C Remove\sthe\s"experimental"\smarking\sfrom\sthe\ssqlite3_preupdate\sinterfaces.\nBut\sbe\ssure\sall\sthe\sinterface\sdefinitions\sare\swithin\s\ndocumentation. +D 2016-11-09T00:57:27.790 F Makefile.in 6fd48ffcf7c2deea7499062d1f3747f986c19678 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc e0217f2d35a0448abbe4b066132ae20136e8b408 @@ -389,7 +389,7 @@ F src/resolve.c 3fac1b2737ea5a724f20b921ac7e259c9be2100b F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac F src/select.c ea3af83e2d0f245fef81ea4cf04cb730ce67f722 F src/shell.c 63e54cfa1c7ec5b70a4c9a86502bc10280c3d5a3 -F src/sqlite.h.in 97e9b0f952306677db82b055147ed1d99cb7ba66 +F src/sqlite.h.in 803f7050f69b2eea573fac219f3c92582c096027 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae F src/sqliteInt.h 37628fe30c464dc790bcee3bfd3d0caa8f222ed1 @@ -1530,7 +1530,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 8cb8516d2009d52d35a22263e4c892f162b34b81 -R 36e33fba7941647bfb228c5ae67f2b63 -U dan -Z a11930824d648f16d0f222498c7f4b67 +P bec5b6d4d083556d111a89186b4f7b35b5e7cebf +R ff2060e290f81fca7217b945d86dd7cc +U drh +Z a7ff54b297c4e1fff86ebb13237d1a94 diff --git a/manifest.uuid b/manifest.uuid index 0835b36ebc..e61f550e0b 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -bec5b6d4d083556d111a89186b4f7b35b5e7cebf \ No newline at end of file +d6dd2ad35ed17e980ed564688499c802e5850386 \ No newline at end of file diff --git a/src/sqlite.h.in b/src/sqlite.h.in index f7bcdd6746..dd70407c1b 100644 --- a/src/sqlite.h.in +++ b/src/sqlite.h.in @@ -127,7 +127,7 @@ extern "C" { /* ** CAPI3REF: Run-Time Library Version Numbers -** KEYWORDS: sqlite3_version, sqlite3_sourceid +** KEYWORDS: sqlite3_version sqlite3_sourceid ** ** These interfaces provide the same information as the [SQLITE_VERSION], ** [SQLITE_VERSION_NUMBER], and [SQLITE_SOURCE_ID] C preprocessor macros @@ -8225,7 +8225,8 @@ int sqlite3_db_cacheflush(sqlite3*); ** ** See also: [sqlite3_update_hook()] */ -SQLITE_EXPERIMENTAL void *sqlite3_preupdate_hook( +#if defined(SQLITE_ENABLE_PREUPDATE_HOOK) +void *sqlite3_preupdate_hook( sqlite3 *db, void(*xPreUpdate)( void *pCtx, /* Copy of third arg to preupdate_hook() */ @@ -8238,10 +8239,11 @@ SQLITE_EXPERIMENTAL void *sqlite3_preupdate_hook( ), void* ); -SQLITE_EXPERIMENTAL int sqlite3_preupdate_old(sqlite3 *, int, sqlite3_value **); -SQLITE_EXPERIMENTAL int sqlite3_preupdate_count(sqlite3 *); -SQLITE_EXPERIMENTAL int sqlite3_preupdate_depth(sqlite3 *); -SQLITE_EXPERIMENTAL int sqlite3_preupdate_new(sqlite3 *, int, sqlite3_value **); +int sqlite3_preupdate_old(sqlite3 *, int, sqlite3_value **); +int sqlite3_preupdate_count(sqlite3 *); +int sqlite3_preupdate_depth(sqlite3 *); +int sqlite3_preupdate_new(sqlite3 *, int, sqlite3_value **); +#endif /* ** CAPI3REF: Low-level system error code