Fix a harmless API signature mismatch in the unix VFS.

FossilOrigin-Name: bab9de7fdda20a724f7c21ec2c25b488ece08b685f1e4fd15c9e73b6b4a0133a

diff --git a/manifest b/manifest
index d824fdaf096d90b3eb6b5f92e4559b136aec98ca..bdd8ba7d825ea97b908cbeded74e4a3a23dcccf4 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C The\squery\splanner\stries\sto\savoids\susing\sindexes\sthat\suse\sunknown\scollating\nfunctions.
-D 2017-12-08T19:37:04.216
+C Fix\sa\sharmless\sAPI\ssignature\smismatch\sin\sthe\sunix\sVFS.
+D 2017-12-09T01:02:33.171
 F Makefile.in 6a879cbf01e37f9eac131414955f71774b566502d9a57ded1b8585b507503cb8
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc e5d7606238f55816da99f719969598df5b091aa2e9a6935c9412fcae8f53fc44
@@ -455,7 +455,7 @@ F src/os.c 22d31db3ca5a96a408fbf1ceeaaebcaf64c87024d2ff9fe1cf2ddbec3e75c104
 F src/os.h 48388821692e87da174ea198bf96b1b2d9d83be5dfc908f673ee21fafbe0d432
 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
 F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
-F src/os_unix.c e87cef0bb894b94d96ee3af210be669549d111c580817d14818101b992640767
+F src/os_unix.c 888afdeab00cd5df5e1c2cefe26926127664d73416e60804576d661cb1c11f52
 F src/os_win.c 7f36120492e4a23c48d1dd685edf29ae459c6d555660c61f1323cea3e5a1191d
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 F src/pager.c 07cf850241667874fcce9d7d924c814305e499b26c804322e2261247b5921903
@@ -1679,7 +1679,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P a079f914522d7bc4b3d27d70114eb09adedfac936a64883e6ed8d382c428dd0e
-R 4ebf4200d512dd6155db0a93b95e863f
+P 02013fc120bf71a8be3550c696a588af8c92f2209f8e5db530624878ddc8aa7e
+R 70ec80a62b754f49e015c4fa7a36d748
 U drh
-Z 0f53fc2b441082d70fbf7ea067c767d4
+Z d8e2fb990ec2e3ae449b802623df526d

diff --git a/manifest.uuid b/manifest.uuid
index 16a4e71f56dfd6c1783d875dc9b1d83ee7d049b4..ae71661621f62757f82a85a657f38a6c3e0f80f6 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-02013fc120bf71a8be3550c696a588af8c92f2209f8e5db530624878ddc8aa7e
\ No newline at end of file
+bab9de7fdda20a724f7c21ec2c25b488ece08b685f1e4fd15c9e73b6b4a0133a
\ No newline at end of file

diff --git a/src/os_unix.c b/src/os_unix.c
index c5d9aca2c62ec87b150c39eeb873ac4e77889f4a..6ba4a5645abaaa24e150520fd75234ee82778833 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -483,7 +483,7 @@ static struct unix_syscall {
 #else
   { "munmap",       (sqlite3_syscall_ptr)0,               0 },
 #endif
-#define osMunmap ((void*(*)(void*,size_t))aSyscall[23].pCurrent)
+#define osMunmap ((int(*)(void*,size_t))aSyscall[23].pCurrent)
 
 #if HAVE_MREMAP && (!defined(SQLITE_OMIT_WAL) || SQLITE_MAX_MMAP_SIZE>0)
   { "mremap",       (sqlite3_syscall_ptr)mremap,          0 },