aboutsummaryrefslogtreecommitdiff
path: root/src/os_unix.c
diff options
context:
space:
mode:
authordrh <drh@noemail.net>2011-06-21 01:29:16 +0000
committerdrh <drh@noemail.net>2011-06-21 01:29:16 +0000
commit34ffcfff0207a6b41e8b8bc3c5e4c1c7bd6a32ae (patch)
tree832dc6bbf38cac3893ec5c03f6dca22b78839167 /src/os_unix.c
parent467eb01caa841f93c1d6c25f0fc192f052343dbe (diff)
parent3c22c604344462ab2cd3fa0be9a4ce4e101eb0b2 (diff)
downloadsqlite-34ffcfff0207a6b41e8b8bc3c5e4c1c7bd6a32ae.tar.gz
sqlite-34ffcfff0207a6b41e8b8bc3c5e4c1c7bd6a32ae.zip
Merge the latest trunk changes into the sessions branch.
FossilOrigin-Name: f3d148e0d10e16cd744ec88a2961fd617368c5ed
Diffstat (limited to 'src/os_unix.c')
-rw-r--r--src/os_unix.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/os_unix.c b/src/os_unix.c
index 5860ae71a..682e74c95 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -138,6 +138,10 @@
# include <sys/mount.h>
#endif
+#ifdef HAVE_UTIME
+# include <utime.h>
+#endif
+
/*
** Allowed values of unixFile.fsFlags
*/
@@ -1939,8 +1943,10 @@ static int dotlockLock(sqlite3_file *id, int eFileLock) {
*/
if( pFile->eFileLock > NO_LOCK ){
pFile->eFileLock = eFileLock;
-#if !OS_VXWORKS
/* Always update the timestamp on the old file */
+#ifdef HAVE_UTIME
+ utime(zLockFile, NULL);
+#else
utimes(zLockFile, NULL);
#endif
return SQLITE_OK;