From: drh <drh@noemail.net>
Date: Wed, 5 Mar 2014 23:12:55 +0000 (+0000)
Subject: Merge compiler-warning fixes from trunk.
X-Git-Tag: version-3.13.0~148^2~155
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3bde1354ff995a17adbdd09bc55bc2bf67220966;p=thirdparty%2Fsqlite.git

Merge compiler-warning fixes from trunk.

FossilOrigin-Name: a1f2b0428518ec18af74a0e01deb4e40cd95a78f
---

3bde1354ff995a17adbdd09bc55bc2bf67220966
diff --cc manifest
index 98e2c9e72e,c073f282a9..50543d2747
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\sin\svarious\sobscure\sbug\sfixes\sand\sthe\sremoval\sof\sMem.memType\sfrom\strunk.
- D 2014-03-05T14:49:51.294
 -C Always\sinclude\sthe\sctype.h\sheader\sin\sthe\sspellfix.c\sextension.
 -D 2014-03-05T19:36:52.892
++C Merge\scompiler-warning\sfixes\sfrom\strunk.
++D 2014-03-05T23:12:55.336
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
 +F Makefile.in e4ee6d36cdf6136aee0158675a3b24dd3bf31a5a
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc fdacba6fb574868c71fde6db6b77789a383a4c19
 +F Makefile.msc b448317831d9c364bf501538becce5cc1f0a0f8b
  F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
  F VERSION 0dc30ad5cf90736d5fd9e540c9f05c542658abe7
@@@ -180,12 -166,12 +180,12 @@@ F src/btmutex.c 976f45a12e37293e32cae02
  F src/btree.c ad795be588e394a0921796f87cc27717359738cc
  F src/btree.h 9e0f97c01b972f779eb7655cfb4f8727fd6dc26f
  F src/btreeInt.h 0be66063468a520e4d66b80c7a1dc26d04ee6ea4
- F src/build.c 00ce613bc2256e525c9195cb10d0df7bcc48d1f0
+ F src/build.c 0d50ef95aad63f4c4fc47f3fa2670d4557c45db0
  F src/callback.c 174e3c8656bc29f91d710ab61550d16eea34be98
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
- F src/ctime.c 77779efbe78dd678d84bfb4fc2e87b6b6ad8dccd
+ F src/ctime.c 0231df905e2c4abba4483ee18ffc05adc321df2a
  F src/date.c 593c744b2623971e45affd0bde347631bdfa4625
 -F src/delete.c cdd57149543bb28304d8f717c243f2a86b1fc280
 +F src/delete.c 19df05f1ab55f021605e1c7a3c0a3851876fb3c7
  F src/expr.c 014b8087a15c4c314bdd798cb1cb0b32693f8b40
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 5269ef07b100763134f71b889327c333bd0989cf
@@@ -232,10 -218,10 +232,10 @@@ F src/resolve.c 273d5f47c4e2c05b2d3d2bf
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
  F src/select.c 0adf172d33cc610ff5ffe26edfd2ba67c3551655
  F src/shell.c 7bf07bcacb181ecc3fc3ccacfdfeb4084aee67ed
 -F src/sqlite.h.in a2ef671f92747a5a1c8a47bad5c585a8dd9eca80
 +F src/sqlite.h.in a31c8b7782a0388b4bd823ed3a3a3e4b93b0cf42
  F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
- F src/sqliteInt.h 9c34060f8d1aa29006b93838399c86ae9af71156
 -F src/sqliteInt.h 7497e95a42f3ec87bf524f1b7231836ac69ed5b0
++F src/sqliteInt.h d24228c061305bd8303a2d220a2a437ab59ef713
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -1170,7 -1155,7 +1170,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
  F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
- P 7f51ad97f0b24c57453d58faf25eee68861faa23 1d134ba2edbdb8c0cf9e99590a69cd17e0b874a9
- R c692d3c8218b4a70137b86898c9b58c9
 -P e406d4bb786a34cdd5dd23ed39f35dfce3e1cabd
 -R dbf6df7a91f37410ffccbad9151ed0f2
++P 0828975d580d309a1c66da4b6caeb65b21a01199 bfd75f471a607b442d8cd8a7070491a158e8fb1a
++R e965e9a7cdd596120cb3952130975039
  U drh
- Z e57469197d4db84c8507a1f208631345
 -Z 435f844ac1ec54f913d9ebdd6e1ebde0
++Z 92046e22a7cea92c290fbcbfd8db2a52
diff --cc manifest.uuid
index af132b0737,96b73158b8..d9b4b55baf
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 0828975d580d309a1c66da4b6caeb65b21a01199
 -bfd75f471a607b442d8cd8a7070491a158e8fb1a
++a1f2b0428518ec18af74a0e01deb4e40cd95a78f