/ Check-in [68e12e06]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Call ioctl() with the correct signature on both Android and stock Linux.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | ioctl-signature
Files: files | file ages | folders
SHA3-256: 68e12e063fe41bcd65cf8a120f838b9b1723ed803ea85240fe0f2145b78df2d7
User & Date: dan 2019-07-15 07:58:28
Context
2019-07-16
05:11
Call ioctl() with the correct signature on both Android and stock Linux. check-in: 24225349 user: dan tags: trunk
2019-07-15
07:58
Call ioctl() with the correct signature on both Android and stock Linux. Closed-Leaf check-in: 68e12e06 user: dan tags: ioctl-signature
2019-07-14
00:15
Mark an unreachable branch using ALWAYS(). check-in: 0fff105a user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/os_unix.c.

   517    517     { "lstat",         (sqlite3_syscall_ptr)0,              0 },
   518    518   #endif
   519    519   #define osLstat      ((int(*)(const char*,struct stat*))aSyscall[27].pCurrent)
   520    520   
   521    521   #if defined(__linux__) && defined(SQLITE_ENABLE_BATCH_ATOMIC_WRITE)
   522    522   # ifdef __ANDROID__
   523    523     { "ioctl", (sqlite3_syscall_ptr)(int(*)(int, int, ...))ioctl, 0 },
          524  +#define osIoctl ((int(*)(int,int,...))aSyscall[28].pCurrent)
   524    525   # else
   525    526     { "ioctl",         (sqlite3_syscall_ptr)ioctl,          0 },
          527  +#define osIoctl ((int(*)(int,unsigned long,...))aSyscall[28].pCurrent)
   526    528   # endif
   527    529   #else
   528    530     { "ioctl",         (sqlite3_syscall_ptr)0,              0 },
   529    531   #endif
   530         -#define osIoctl ((int(*)(int,int,...))aSyscall[28].pCurrent)
   531    532   
   532    533   }; /* End of the overrideable system calls */
   533    534   
   534    535   
   535    536   /*
   536    537   ** On some systems, calls to fchown() will trigger a message in a security
   537    538   ** log if they come from non-root processes.  So avoid calling fchown() if