Merge header file fixes from trunk.

FossilOrigin-Name: 7c2713e98ffb5f0d96eb7de9514eab43f0712011

diff --cc manifest
index e61245578eacdaa31efcc51c5ca80cabaa922f60,667104cb0737d1f29b4b0d8fea87918efb8d7e93..6e096c9ed7d19e3e0c83a27fb31a7051539beef1
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Add\sthe\sjson_tree()\svirtual\stable.
- D 2015-08-21T17:33:11.034
 -C Add\sa\smissing\s#define\sfor\ssqlite3_vsnprintf\sto\ssqlite3ext.h.
 -D 2015-08-21T19:53:06.112
++C Merge\sheader\sfile\sfixes\sfrom\strunk.
++D 2015-08-21T19:56:45.243
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 4f663b6b4954b9b1eb0e6f08387688a93b57542d
 +F Makefile.in 90f3097efb9a53f5fc59a4f8a08be07cf9f52c02
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc cf63e11a5395cf887515ac7b78e2057dfe442fcd
 +F Makefile.msc f6ed2ce438f711641dc63d762bb0d41aa659518f
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION ccfc4d1576dbfdeece0a4372a2e6a2e37d3e7975
@@@ -1378,7 -1376,7 +1378,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 67375f32d931351964d75d20671c4a6d8a294d7d
- R 04df6b832ca03284862f85e8c558517f
 -P 53b593fcae178f2e08f758ae6fd100869f771bfd
 -R ebc4801d5f618bfa6944c04f2d984190
++P 08c36e45f0d3a7b89caf823652d7543b76ac802a da3c9df09c46564353218d0163e378b880a3ce62
++R 7de9031da9783d58b8a952bc530228c5
  U drh
- Z cf8d2d5c1b53f98340deaf5efc7338be
 -Z 0c4320af06ae345cfafae29306ed4bea
++Z 5f4a9a3778df860327f346518d686e5d

diff --cc manifest.uuid
index 09f5d503b9a81475d5deb40ff2060c964a8ee82b,646c99b26adb0873b14724a86def5b04c506701e..ded172cdf04843f5590a040a768a8f802da5d5d4
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 08c36e45f0d3a7b89caf823652d7543b76ac802a
 -da3c9df09c46564353218d0163e378b880a3ce62
++7c2713e98ffb5f0d96eb7de9514eab43f0712011