Call ioctl() with the correct signature on both Android and stock Linux.

FossilOrigin-Name: 68e12e063fe41bcd65cf8a120f838b9b1723ed803ea85240fe0f2145b78df2d7

diff --git a/manifest b/manifest
index fac0eaf63c19f96aa79bbc312f7fac02a563a0da..d80dbd466cc145fab6b0c84bcf2ce2a5f86b3ae9 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Mark\san\sunreachable\sbranch\susing\sALWAYS().
-D 2019-07-14T00:15:07.292
+C Call\sioctl()\swith\sthe\scorrect\ssignature\son\sboth\sAndroid\sand\sstock\sLinux.
+D 2019-07-15T07:58:28.770
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -506,7 +506,7 @@ F src/os.c 8aeb0b0f40f8f5b0da03fe49706695adaf42d2f516ab95abc72e86c245e119de
 F src/os.h 48388821692e87da174ea198bf96b1b2d9d83be5dfc908f673ee21fafbe0d432
 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
 F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
-F src/os_unix.c 94576efb914859d235b879a4c784da3121bf1f5514e4cad972652d2c60db195d
+F src/os_unix.c 7a2e00cf63588096f356451b7405bf9c7316e1cd8543a7cfbe64e8ffed2e3f34
 F src/os_win.c 85d9e532d0444ab6c16d7431490c2e279e282aa0917b0e988996b1ae0de5c5a0
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 F src/pager.c 422fd8cfa59fb9173eff36a95878904a0eeb0dcc62ba49350acc8b1e51c4dc7b
@@ -1835,7 +1835,10 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 85fd70fead834aed16cffbea892b2255b4e10dd677f4dbbb96062d5ff42efdeb
-R 2916789ca16bd517dcf20e2c1512a43b
-U drh
-Z 6e17128a6889867592c726db142aced4
+P 0fff105a3e501fd91877d67761459eb0323e6cf79916242027cce0d05697f554
+R 5a921a0dc3c6d4350628adbba51b0e1c
+T *branch * ioctl-signature
+T *sym-ioctl-signature *
+T -sym-trunk *
+U dan
+Z fc3c9b67572fed9c7fe911b501f0eb15

diff --git a/manifest.uuid b/manifest.uuid
index d859b76fecd58da627fba324fe52d6c0cf4e66d6..7be488c81360eede2f58294dc56c6555a44f0311 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0fff105a3e501fd91877d67761459eb0323e6cf79916242027cce0d05697f554
\ No newline at end of file
+68e12e063fe41bcd65cf8a120f838b9b1723ed803ea85240fe0f2145b78df2d7
\ No newline at end of file

diff --git a/src/os_unix.c b/src/os_unix.c
index 103df1d199f5645ba38b12eb9cdd785ac585efff..0a7c4bb467cafe389976a84aa0fbd0f835678a5a 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -521,13 +521,14 @@ static struct unix_syscall {
 #if defined(__linux__) && defined(SQLITE_ENABLE_BATCH_ATOMIC_WRITE)
 # ifdef __ANDROID__
   { "ioctl", (sqlite3_syscall_ptr)(int(*)(int, int, ...))ioctl, 0 },
+#define osIoctl ((int(*)(int,int,...))aSyscall[28].pCurrent)
 # else
   { "ioctl",         (sqlite3_syscall_ptr)ioctl,          0 },
+#define osIoctl ((int(*)(int,unsigned long,...))aSyscall[28].pCurrent)
 # endif
 #else
   { "ioctl",         (sqlite3_syscall_ptr)0,              0 },
 #endif
-#define osIoctl ((int(*)(int,int,...))aSyscall[28].pCurrent)
 
 }; /* End of the overrideable system calls */