From: drh <drh@noemail.net>
Date: Sat, 12 Nov 2011 15:41:52 +0000 (+0000)
Subject: Merge the windows xSyscall enhancements into trunk.
X-Git-Tag: mountain-lion~9^2~26
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cc682cc875d7877bd9a2049f66cc6b2230673a57;p=thirdparty%2Fsqlite.git

Merge the windows xSyscall enhancements into trunk.

FossilOrigin-Name: c1fab9aca1fe1dda2b4c7e4fdc0a406998847bdb
---

cc682cc875d7877bd9a2049f66cc6b2230673a57
diff --cc manifest
index 2df6569372,82f3c653e6..cdc683141c
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Catch\sand\sreport\serrors\sfrom\ssqlite3OsFullPathname().
- D 2011-11-11T23:51:15.820
 -C Make\ssure\sto\sflag\sbenign\smalloc\sfailures\sin\sthe\sWindows\sVFS\sas\ssuch.\s\sExpand\suse\sof\sthe\sDO_OS_MALLOC_TEST\sto\scover\sthe\sVFS\sfunctions\sthat\scan\snow\sreturn\san\sout\sof\smemory\serror.\s\sSupport\san\sexperimental\s--match\soption\sto\sthe\stest\ssuite\sthat\swill\srun\sonly\sthose\stests\smatching\sthe\sspecified\spattern.
 -D 2011-11-12T03:17:40.954
++C Merge\sthe\swindows\sxSyscall\senhancements\sinto\strunk.
++D 2011-11-12T15:41:52.950
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 5b4a3e12a850b021547e43daf886b25133b44c07
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -974,7 -974,7 +974,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P 471cf0d8e7857110e525e029c2d535cb518dba6a
- R 65b07c80cc955ef693a9df9b61c2f7e6
 -P 8966ec1797be63d1305628d459bdad5be08cf3ca
 -R b05037fbfa7e2180ed81bf446e380e48
 -U mistachkin
 -Z 1660438f613633eeb0e91d69e2a176bd
++P 77119785c84ac7f416ed72c38c532399b6093d7a 76dec8aa9dbbc39e0a7c3b358b58ce7f7a477a2b
++R ed313c65fa66f4a0f305ec8176ce8f6d
 +U drh
- Z 2bcb48737ffc2ef5d0789f9c5e08f674
++Z 011c8308c57c9b72d1c6dd7078495814
diff --cc manifest.uuid
index d5d2731377,6a03a23564..4f5951bb69
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 77119785c84ac7f416ed72c38c532399b6093d7a
 -76dec8aa9dbbc39e0a7c3b358b58ce7f7a477a2b
++c1fab9aca1fe1dda2b4c7e4fdc0a406998847bdb