From: drh <drh@noemail.net>
Date: Wed, 4 May 2016 21:06:21 +0000 (+0000)
Subject: Disable the session extension API if SQLITE_ENABLE_SESSION is not defined.
X-Git-Tag: version-3.13.0~35
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4e80d5fcf1e05bb1d81a9acf02d74fc16ab79b9f;p=thirdparty%2Fsqlite.git

Disable the session extension API if SQLITE_ENABLE_SESSION is not defined.

FossilOrigin-Name: 71af9ac165ac02272f4886f69bd9ab4770fd7bb6
---

diff --git a/ext/session/sqlite3session.h b/ext/session/sqlite3session.h
index 71f02159cf..23d9a33aef 100644
--- a/ext/session/sqlite3session.h
+++ b/ext/session/sqlite3session.h
@@ -1,5 +1,5 @@
 
-#ifndef __SQLITESESSION_H_
+#if !defined(__SQLITESESSION_H_) && defined(SQLITE_ENABLE_SESSION)
 #define __SQLITESESSION_H_ 1
 
 /*
@@ -1274,4 +1274,4 @@ int sqlite3changegroup_output_strm(sqlite3_changegroup*,
 }
 #endif
 
-#endif  /* SQLITE_ENABLE_SESSION && SQLITE_ENABLE_PREUPDATE_HOOK */
+#endif  /* !defined(__SQLITESESSION_H_) && defined(SQLITE_ENABLE_SESSION) */
diff --git a/manifest b/manifest
index 6d5d323836..12eedad414 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\stypo\sin\scomment.\s\sNo\schanges\sto\scode.
-D 2016-05-04T19:04:20.094
+C Disable\sthe\ssession\sextension\sAPI\sif\sSQLITE_ENABLE_SESSION\sis\snot\sdefined.
+D 2016-05-04T21:06:21.506
 F Makefile.in 9eda6e1c90d05c199c3ec8a7069b0682ad307657
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc db82b35aef27f412fef14d8534afc022138bcdfd
@@ -294,7 +294,7 @@ F ext/session/session_common.tcl a1293167d14774b5e728836720497f40fe4ea596
 F ext/session/sessionfault.test da273f2712b6411e85e71465a1733b8501dbf6f7
 F ext/session/sessionfault2.test 04aa0bc9aa70ea43d8de82c4f648db4de1e990b0
 F ext/session/sqlite3session.c 37485891b4add26cf61495df193c419f36556a32
-F ext/session/sqlite3session.h 64e9e7f185725ef43b97f4a9a0c0df0669844f1d
+F ext/session/sqlite3session.h 69bf73cfd71e58f2ae5d2aa935b2c1a541aee555
 F ext/session/test_session.c 464f2c8bf502795d95969387eb8e93f68c513c15
 F ext/userauth/sqlite3userauth.h 19cb6f0e31316d0ee4afdfb7a85ef9da3333a220
 F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
@@ -1487,7 +1487,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 aae389692a2ed2cc92151d51fb2cd5a16921c469
-R 7eec09085d0724a070665f564c0beb44
-U mistachkin
-Z d55bbbb1bc35091ae5bebd4e60554f06
+P 6c43ba1c8753a4029e127078652f265c408a01c0
+R a7d4cc11d472462953b7d84c093e9aa1
+U drh
+Z c3eb846652f8b95f225fc6721b0d9cb4
diff --git a/manifest.uuid b/manifest.uuid
index 1471b0ed2d..32ae23744e 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6c43ba1c8753a4029e127078652f265c408a01c0
\ No newline at end of file
+71af9ac165ac02272f4886f69bd9ab4770fd7bb6
\ No newline at end of file