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

requirements scanner.

FossilOrigin-Name: a3151ce15c256219646013d695b6e162e306cef8
This commit is contained in:
drh 2011-10-19 17:13:08 +00:00
parent e459b07601
commit d76b64e1c6
3 changed files with 10 additions and 10 deletions

View File

@ -1,5 +1,5 @@
C Merge\sthe\sfts4-content\sbranch\swith\sthe\strunk. C Fix\scomments\son\sSQLITE_CONFIG_HEAP\sso\sthat\sthey\sdo\snot\sinterfere\swith\sthe\nrequirements\sscanner.
D 2011-10-19T16:20:40.613 D 2011-10-19T17:13:08.805
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in a162fe39e249b8ed4a65ee947c30152786cfe897 F Makefile.in a162fe39e249b8ed4a65ee947c30152786cfe897
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@ -181,7 +181,7 @@ F src/resolve.c 365ab1c870e38596d6869e76fb544fe6e4ffc809
F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697 F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
F src/select.c 80f3ac44a8514b1d107b80f5df4a424ae059d2b6 F src/select.c 80f3ac44a8514b1d107b80f5df4a424ae059d2b6
F src/shell.c f0ab793261ab045a0b8c47fa2707e8a894d2898f F src/shell.c f0ab793261ab045a0b8c47fa2707e8a894d2898f
F src/sqlite.h.in 5ec7488ef4c124ae905286600a9f2d64250aebb1 F src/sqlite.h.in c3d7085eb5f7d3b4ce7a484e0ecb9082e57daab1
F src/sqlite3ext.h 1a1a4f784aa9c3b00edd287940197de52487cd93 F src/sqlite3ext.h 1a1a4f784aa9c3b00edd287940197de52487cd93
F src/sqliteInt.h 6f8e592fc28d16160d017684966b3528833a46c1 F src/sqliteInt.h 6f8e592fc28d16160d017684966b3528833a46c1
F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
@ -972,7 +972,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
P d65f63531c3f8e3e55e656f049240714a3d7433f df36ac948179f37b432a88701b6c79299e073ce8 P 8a4077057ddeb08e8edc5f20a75abaaba7a278ba
R 3877ede50d6923a62a70ae0714da94fb R b6475ab92965b41fc368318dd410ee81
U dan U drh
Z e6c406cc06dcce98e86f6b11f422dc50 Z d1c63652bd6e0c53508e2b02187c5b10

View File

@ -1 +1 @@
8a4077057ddeb08e8edc5f20a75abaaba7a278ba a3151ce15c256219646013d695b6e162e306cef8

View File

@ -1399,8 +1399,8 @@ struct sqlite3_mem_methods {
** allocator is engaged to handle all of SQLites memory allocation needs. ** allocator is engaged to handle all of SQLites memory allocation needs.
** The first pointer (the memory pointer) must be aligned to an 8-byte ** The first pointer (the memory pointer) must be aligned to an 8-byte
** boundary or subsequent behavior of SQLite will be undefined. ** boundary or subsequent behavior of SQLite will be undefined.
** The minimum allocation size is capped at 2^12. Reasonable values ** The minimum allocation size is capped at 2**12. Reasonable values
** for the minimum allocation size are 2^5 through 2^8.</dd> ** for the minimum allocation size are 2**5 through 2**8.</dd>
** **
** [[SQLITE_CONFIG_MUTEX]] <dt>SQLITE_CONFIG_MUTEX</dt> ** [[SQLITE_CONFIG_MUTEX]] <dt>SQLITE_CONFIG_MUTEX</dt>
** <dd> ^(This option takes a single argument which is a pointer to an ** <dd> ^(This option takes a single argument which is a pointer to an