]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Import compiler warning and autoconf makefile fixes from trunk.
authordrh <drh@noemail.net>
Fri, 5 Dec 2014 00:49:47 +0000 (00:49 +0000)
committerdrh <drh@noemail.net>
Fri, 5 Dec 2014 00:49:47 +0000 (00:49 +0000)
FossilOrigin-Name: 5437e0534a9647b449474df140a88bb8e4e42791

1  2 
Makefile.in
manifest
manifest.uuid
src/test1.c

diff --cc Makefile.in
Simple merge
diff --cc manifest
index 412632c23f35019bfd29833dcfb207d3257f2d0d,375f1f89b0bf1b2719bec053bc831222daa8753e..543c3a9c050823b26bb8a068ecfe9926fff0657f
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Import\sfrom\strunk\ssupport\sfor\sSQLITE_CHECKPOINT_TRUNCATE\sand\sfixes\sfor\na\scouple\sof\sobscure\sbugs.
- D 2014-12-04T23:42:28.717
 -C Fix\scompiler\swarnings.
 -D 2014-12-05T00:32:09.905
++C Import\scompiler\swarning\sand\sautoconf\smakefile\sfixes\sfrom\strunk.
++D 2014-12-05T00:49:47.900
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 73a6c2ce505d58bbb21bb703402fbe61fb8b4fd5
 -F Makefile.in 6c4f961fa91d0b4fa121946a19f9e5eac2f2f809
++F Makefile.in 4551c03de49c2a4d400016f9007df2528d79e3cd
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 788f1288633a0c3c3cbbe0f3e4827d033f7ba530
+ F Makefile.msc 10720782f88648bf2b5dcedf4c1524b067d43e47
  F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
  F VERSION d846487aff892625eb8e75960234e7285f0462fe
@@@ -242,7 -238,7 +242,7 @@@ F src/sqliteLimit.h 164b0e6749d31e0daa1
  F src/status.c 81712116e826b0089bb221b018929536b2b5406f
  F src/table.c f142bba7903e93ca8d113a5b8877a108ad1a27dc
  F src/tclsqlite.c 0a874655dd39a9875e39c5d3c464db662171d228
- F src/test1.c 2322857b226535269e92656a9f0ab80117d21d2a
 -F src/test1.c c24d7f67252348d756773a6dbe23a61b4552f709
++F src/test1.c 1116f898f5ad4fc2bfa2ff9f943e3a03a44c6a14
  F src/test2.c 98049e51a17dc62606a99a9eb95ee477f9996712
  F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
  F src/test4.c 9b32d22f5f150abe23c1830e2057c4037c45b3df
@@@ -1228,7 -1223,7 +1228,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 43c4ba26a20ca0230d898a6431ed9ae5cfdb63d3 0d3aef97ebddf422b8bdcbc5878970c6129e3f54
- R 358aba7ceaa84d8889281503fc35c381
 -P 520c2b838da8b230487c8c66f3ba8e5daa1ca886
 -R 2f1363efb358b758f4fe53b98d762c1d
++P 463ad971d2a427f50564b409a021a910004c1423 e9955c0e14d13ba1411f013acb4979958dae2516
++R 48381641a946ccc7349c72449b00abc0
  U drh
- Z 35f5e2756c80a1bd34c5e223871aa152
 -Z 8ac94f0b609313b69c75d4df8f71997e
++Z a7b383b16545d202cd6347c755161847
diff --cc manifest.uuid
index a53c7ce78882288475b6ab066bad4f414fc13ab8,0fa8785978fec9b608a3d459db6736401ba5586b..b957f9624fd5e6ad21c8074d5bb637c3e651228f
@@@ -1,1 -1,1 +1,1 @@@
- 463ad971d2a427f50564b409a021a910004c1423
 -e9955c0e14d13ba1411f013acb4979958dae2516
++5437e0534a9647b449474df140a88bb8e4e42791
diff --cc src/test1.c
Simple merge