/ Check-in [9d686009]
Login
SQLite training in Houston TX on 2019-11-05 (details)
Part of the 2019 Tcl Conference

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

Overview
Comment:Merge updates from trunk.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | mmapDisabled
Files: files | file ages | folders
SHA1: 9d6860098f96efc7ea60e2d6116fb7d0e2685a55
User & Date: mistachkin 2013-08-26 19:36:18
Context
2013-08-26
20:45
Change MAX_PATH related defines to use character lengths where WCHARs are used. check-in: 0a497083 user: mistachkin tags: mmapDisabled
19:36
Merge updates from trunk. check-in: 9d686009 user: mistachkin tags: mmapDisabled
14:30
Fix for builds with both SQLITE_OMIT_WAL and SQLITE_MAX_MMAP_SIZE=0 defined. check-in: edd5dbdc user: dan tags: trunk
2013-08-24
23:55
Several modifications to the use of the MAX_PATH macro on Windows to improve consistency. check-in: bda4c47d user: mistachkin tags: mmapDisabled
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/os_unix.c.

   447    447   
   448    448     { "rmdir",        (sqlite3_syscall_ptr)rmdir,           0 },
   449    449   #define osRmdir     ((int(*)(const char*))aSyscall[19].pCurrent)
   450    450   
   451    451     { "fchown",       (sqlite3_syscall_ptr)posixFchown,     0 },
   452    452   #define osFchown    ((int(*)(int,uid_t,gid_t))aSyscall[20].pCurrent)
   453    453   
          454  +#if !defined(SQLITE_OMIT_WAL) || SQLITE_MAX_MMAP_SIZE>0
   454    455     { "mmap",       (sqlite3_syscall_ptr)mmap,     0 },
   455    456   #define osMmap ((void*(*)(void*,size_t,int,int,int,off_t))aSyscall[21].pCurrent)
   456    457   
   457    458     { "munmap",       (sqlite3_syscall_ptr)munmap,          0 },
   458    459   #define osMunmap ((void*(*)(void*,size_t))aSyscall[22].pCurrent)
   459    460   
   460    461   #if HAVE_MREMAP
   461    462     { "mremap",       (sqlite3_syscall_ptr)mremap,          0 },
   462    463   #else
   463    464     { "mremap",       (sqlite3_syscall_ptr)0,               0 },
   464    465   #endif
   465    466   #define osMremap ((void*(*)(void*,size_t,size_t,int,...))aSyscall[23].pCurrent)
          467  +#endif
   466    468   
   467    469   }; /* End of the overrideable system calls */
   468    470   
   469    471   /*
   470    472   ** This is the xSetSystemCall() method of sqlite3_vfs for all of the
   471    473   ** "unix" VFSes.  Return SQLITE_OK opon successfully updating the
   472    474   ** system call pointer, or SQLITE_NOTFOUND if there is no configurable