]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Import from trunk the fix the "test" target on the autoconf and MSVC makefiles
authordrh <drh@noemail.net>
Fri, 5 Dec 2014 00:41:17 +0000 (00:41 +0000)
committerdrh <drh@noemail.net>
Fri, 5 Dec 2014 00:41:17 +0000 (00:41 +0000)
and some minor compiler warning fixes.

FossilOrigin-Name: c9f20eb2fbba0868df85ebb98877f9bb969be8a4

1  2 
Makefile.in
Makefile.msc
manifest
manifest.uuid

diff --cc Makefile.in
Simple merge
diff --cc Makefile.msc
Simple merge
diff --cc manifest
index 6ebd011b8777d7ada92f08a2c37a0832f8f3cd01,375f1f89b0bf1b2719bec053bc831222daa8753e..fdd0b729ea2c1b54a2b217c6197297de4e7f2dcf
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Incorporate\sthe\sSQLITE_CHECKPOINT_TRUNCATE\senhancement\sand\sa\scouple\sof\nobscure\sbug\sfixes\sfrom\strunk.
- D 2014-12-04T23:35:08.510
 -C Fix\scompiler\swarnings.
 -D 2014-12-05T00:32:09.905
++C Import\sfrom\strunk\sthe\sfix\sthe\s"test"\starget\son\sthe\sautoconf\sand\sMSVC\smakefiles\nand\ssome\sminor\scompiler\swarning\sfixes.
++D 2014-12-05T00:41:17.266
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in e2007fafb7b679a39800a1d636dcc6662a840530
 -F Makefile.in 6c4f961fa91d0b4fa121946a19f9e5eac2f2f809
++F Makefile.in 0869fe2a3b7853f048a945fd9cdf671a329b7351
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 64f7ba446298db653fc195ad7699e4b06863d9c4
 -F Makefile.msc 10720782f88648bf2b5dcedf4c1524b067d43e47
++F Makefile.msc 212dc90adfad8988134bf3d901a78270d7a9c267
  F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
  F VERSION d846487aff892625eb8e75960234e7285f0462fe
@@@ -254,8 -237,8 +254,8 @@@ F src/sqliteInt.h aff67183ad2b5d29f71a3
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 81712116e826b0089bb221b018929536b2b5406f
  F src/table.c f142bba7903e93ca8d113a5b8877a108ad1a27dc
 -F src/tclsqlite.c 0a874655dd39a9875e39c5d3c464db662171d228
 +F src/tclsqlite.c 05be57620509060e85064b9495256c05d56e76b0
- F src/test1.c f5d7ecd3dd663b11f35269fd91f7090db0570903
+ F src/test1.c c24d7f67252348d756773a6dbe23a61b4552f709
  F src/test2.c 98049e51a17dc62606a99a9eb95ee477f9996712
  F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
  F src/test4.c 9b32d22f5f150abe23c1830e2057c4037c45b3df
@@@ -1241,7 -1223,7 +1241,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 2617d93713d9f4cf907ab2e7baef6a0f74f7198e 0d3aef97ebddf422b8bdcbc5878970c6129e3f54
- R 6c3870353869dc63de6b6e7262754990
 -P 520c2b838da8b230487c8c66f3ba8e5daa1ca886
 -R 2f1363efb358b758f4fe53b98d762c1d
++P 34ffa3b3c002b0e87d8382ad76e87dbaec0b2bc6 e9955c0e14d13ba1411f013acb4979958dae2516
++R 4ae9fe307118343dad082c4eb733ef9c
  U drh
- Z 0421768e128ea5c34e2d7a186ce23ac0
 -Z 8ac94f0b609313b69c75d4df8f71997e
++Z 9623b2dce920052ac42bbb47ec4723c7
diff --cc manifest.uuid
index b765ac2f7de2f292ecb4e9ec9582b39d734c12e8,0fa8785978fec9b608a3d459db6736401ba5586b..5ae151d7209eda81202c1e495ed16eb3da4bc433
@@@ -1,1 -1,1 +1,1 @@@
- 34ffa3b3c002b0e87d8382ad76e87dbaec0b2bc6
 -e9955c0e14d13ba1411f013acb4979958dae2516
++c9f20eb2fbba0868df85ebb98877f9bb969be8a4