From: drh <drh@noemail.net>
Date: Wed, 19 Oct 2011 17:13:08 +0000 (+0000)
Subject: Fix comments on SQLITE_CONFIG_HEAP so that they do not interfere with the
X-Git-Tag: version-3.7.9~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d76b64e1c646c5bf463b6bf8e53741cfec301ed0;p=thirdparty%2Fsqlite.git

Fix comments on SQLITE_CONFIG_HEAP so that they do not interfere with the
requirements scanner.

FossilOrigin-Name: a3151ce15c256219646013d695b6e162e306cef8
---

diff --git a/manifest b/manifest
index 528e4691d0..17377c52ac 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\sthe\sfts4-content\sbranch\swith\sthe\strunk.
-D 2011-10-19T16:20:40.613
+C Fix\scomments\son\sSQLITE_CONFIG_HEAP\sso\sthat\sthey\sdo\snot\sinterfere\swith\sthe\nrequirements\sscanner.
+D 2011-10-19T17:13:08.805
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in a162fe39e249b8ed4a65ee947c30152786cfe897
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -181,7 +181,7 @@ F src/resolve.c 365ab1c870e38596d6869e76fb544fe6e4ffc809
 F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
 F src/select.c 80f3ac44a8514b1d107b80f5df4a424ae059d2b6
 F src/shell.c f0ab793261ab045a0b8c47fa2707e8a894d2898f
-F src/sqlite.h.in 5ec7488ef4c124ae905286600a9f2d64250aebb1
+F src/sqlite.h.in c3d7085eb5f7d3b4ce7a484e0ecb9082e57daab1
 F src/sqlite3ext.h 1a1a4f784aa9c3b00edd287940197de52487cd93
 F src/sqliteInt.h 6f8e592fc28d16160d017684966b3528833a46c1
 F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
@@ -972,7 +972,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P d65f63531c3f8e3e55e656f049240714a3d7433f df36ac948179f37b432a88701b6c79299e073ce8
-R 3877ede50d6923a62a70ae0714da94fb
-U dan
-Z e6c406cc06dcce98e86f6b11f422dc50
+P 8a4077057ddeb08e8edc5f20a75abaaba7a278ba
+R b6475ab92965b41fc368318dd410ee81
+U drh
+Z d1c63652bd6e0c53508e2b02187c5b10
diff --git a/manifest.uuid b/manifest.uuid
index eef6d62dc6..61f55395f6 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8a4077057ddeb08e8edc5f20a75abaaba7a278ba
\ No newline at end of file
+a3151ce15c256219646013d695b6e162e306cef8
\ No newline at end of file
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index 833d9c5ce6..32769c5829 100644
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -1399,8 +1399,8 @@ struct sqlite3_mem_methods {
 ** allocator is engaged to handle all of SQLites memory allocation needs.
 ** The first pointer (the memory pointer) must be aligned to an 8-byte
 ** boundary or subsequent behavior of SQLite will be undefined.
-** The minimum allocation size is capped at 2^12. Reasonable values
-** for the minimum allocation size are 2^5 through 2^8.</dd>
+** The minimum allocation size is capped at 2**12. Reasonable values
+** for the minimum allocation size are 2**5 through 2**8.</dd>
 **
 ** [[SQLITE_CONFIG_MUTEX]] <dt>SQLITE_CONFIG_MUTEX</dt>
 ** <dd> ^(This option takes a single argument which is a pointer to an