diff options
| author | drh <drh@noemail.net> | 2011-07-22 12:49:27 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2011-07-22 12:49:27 +0000 |
| commit | 8a3bb3fddd85f113cdc6e0cea297fcbc31be0876 (patch) | |
| tree | 5231ec83bc56ca52a33345e5bb19565239da1091 /src/os_unix.c | |
| parent | ff53032641c6a9e01b3e9c8425c3a101fd7f7546 (diff) | |
| parent | 75e7bc1db7027404e65841b2da934324a3dc5dbd (diff) | |
| download | sqlite-8a3bb3fddd85f113cdc6e0cea297fcbc31be0876.tar.gz sqlite-8a3bb3fddd85f113cdc6e0cea297fcbc31be0876.zip | |
Merge the latest trunk changes into the sessions branch.
FossilOrigin-Name: 110cfd6920cf3011aeaf7e586f8db867bfc69fbb
Diffstat (limited to 'src/os_unix.c')
| -rw-r--r-- | src/os_unix.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/os_unix.c b/src/os_unix.c index 682e74c95..b2956c164 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -677,7 +677,9 @@ static int sqliteErrorFromPosixError(int posixError, int sqliteIOErr) { case ENODEV: case ENXIO: case ENOENT: +#ifdef ESTALE /* ESTALE is not defined on Interix systems */ case ESTALE: +#endif case ENOSYS: /* these should force the client to close the file and reconnect */ @@ -3672,7 +3674,7 @@ static void unixShmPurge(unixFile *pFd){ if( p && p->nRef==0 ){ int i; assert( p->pInode==pFd->pInode ); - if( p->mutex ) sqlite3_mutex_free(p->mutex); + sqlite3_mutex_free(p->mutex); for(i=0; i<p->nRegion; i++){ if( p->h>=0 ){ munmap(p->apRegion[i], p->szRegion); |