]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Better loadable extension handling in the Win32 VFS when compiled for Cygwin.
authormistachkin <mistachkin@noemail.net>
Thu, 6 Mar 2014 00:30:27 +0000 (00:30 +0000)
committermistachkin <mistachkin@noemail.net>
Thu, 6 Mar 2014 00:30:27 +0000 (00:30 +0000)
FossilOrigin-Name: 29b0a4f158785449b6f3da6fcceeb63442c9711c

1  2 
manifest
manifest.uuid
src/os_win.c

diff --cc manifest
index 0f16c73f7747bb90ebf600a671cd49a8ff152a03,fc4f0247aa9428b7fd82c4ffd8125ccd0618e563..9ebba2561837e899c7ecf5194df53a46c5ec12a2
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Better\ssupport\sfor\sMinGW\s4.x.
- D 2014-03-06T00:28:57.468
 -C Merge\supdates\sfrom\strunk.
 -D 2014-02-24T21:23:07.956
++C Better\sloadable\sextension\shandling\sin\sthe\sWin32\sVFS\swhen\scompiled\sfor\sCygwin.
++D 2014-03-06T00:30:27.980
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -203,7 -203,7 +203,7 @@@ F src/os.c 1b147e4cf7cc39e618115c14a086
  F src/os.h 4a46270a64e9193af4a0aaa3bc2c66dc07c29b3f
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
  F src/os_unix.c 18f7f95dc6bcb9cf4d4a238d8e2de96611bc2ae5
- F src/os_win.c c47f107fc5c9d3466c06ea4aa35822f3568e81ee
 -F src/os_win.c 9ce043722f5d959c52c9a751e5c960602de0927b
++F src/os_win.c e71678ac927d0a0fb11d993db20a9748eabf808e
  F src/pager.c 0ffa313a30ed6d061d9c6601b7b175cc50a1cab7
  F src/pager.h ffd5607f7b3e4590b415b007a4382f693334d428
  F src/parse.y 2613ca5d609c2f3d71dd297351f010bcec16e1e0
@@@ -1155,7 -1151,7 +1155,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 bfd75f471a607b442d8cd8a7070491a158e8fb1a 057c16ee9786efcad6372a29b02d743ff3d628ff
- R b889d993282d9fdfec953c32c532c8a0
 -P 6676475c47558a52cb2632e92a541e13d143b2dc 53081e7202fb55f792a78e73627466eb0200f11c
 -R 18f77ade6087ed733fbdb268f6f34961
++P 170e0585202eec6882e9513eba05e6d5767bfc5b 854d410ad3a2bb3af5465d933ac9535fe3f22bfe
++R dbc36dfda03a0ba225e8ff052c2c6fea
  U mistachkin
- Z 62fcd2f0166a563cdb61df2df73d8704
 -Z 803bfaab7aa1ae283bf7c1240bdf5b59
++Z 97b3517e69e758ff54d2564329fd6e38
diff --cc manifest.uuid
index 1e263110cf6476b76c3a4396f8b81868884456bb,edfc0c818208bba23edf52e9f16e892d000193f8..41cd05f2ef60ac8ece69bf2010f9a4a27640c385
@@@ -1,1 -1,1 +1,1 @@@
- 170e0585202eec6882e9513eba05e6d5767bfc5b
 -854d410ad3a2bb3af5465d933ac9535fe3f22bfe
++29b0a4f158785449b6f3da6fcceeb63442c9711c
diff --cc src/os_win.c
Simple merge