diff options
author | Hans-Christoph Steiner <hans@eds.org> | 2014-10-16 23:12:33 -0400 |
---|---|---|
committer | Hans-Christoph Steiner <hans@eds.org> | 2014-10-16 23:12:33 -0400 |
commit | 121be71cab384e98755def99c2c4dc3dc82806ac (patch) | |
tree | 50a57e97bee3aa700989337ff2297088d11a2b68 /debian/patches/20-hurd-locking-style.patch | |
parent | 9ce5373557d7740469c5e43231414d8bb9c3000f (diff) |
updated patches from sqlite3_3.8.6 package
Diffstat (limited to 'debian/patches/20-hurd-locking-style.patch')
-rw-r--r-- | debian/patches/20-hurd-locking-style.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/debian/patches/20-hurd-locking-style.patch b/debian/patches/20-hurd-locking-style.patch index 73e72a3..a6da3ab 100644 --- a/debian/patches/20-hurd-locking-style.patch +++ b/debian/patches/20-hurd-locking-style.patch @@ -1,15 +1,15 @@ --- a/src/os_unix.c +++ b/src/os_unix.c -@@ -131,7 +131,7 @@ +@@ -97,7 +97,7 @@ + # include <sys/mman.h> #endif - --#if SQLITE_ENABLE_LOCKING_STYLE -+#if SQLITE_ENABLE_LOCKING_STYLE || defined(__GNU__) +-#if SQLITE_ENABLE_LOCKING_STYLE || OS_VXWORKS ++#if SQLITE_ENABLE_LOCKING_STYLE || OS_VXWORKS || defined(__GNU__) # include <sys/ioctl.h> # if OS_VXWORKS # include <semaphore.h> -@@ -2198,7 +2198,7 @@ +@@ -2214,7 +2214,7 @@ ** Omit this section if SQLITE_ENABLE_LOCKING_STYLE is turned off or if ** compiling for VXWORKS. */ @@ -18,7 +18,7 @@ /* ** Retry flock() calls that fail with EINTR -@@ -4927,7 +4927,7 @@ +@@ -4992,7 +4992,7 @@ dotlockCheckReservedLock /* xCheckReservedLock method */ ) @@ -27,7 +27,7 @@ IOMETHODS( flockIoFinder, /* Finder function name */ flockIoMethods, /* sqlite3_io_methods object name */ -@@ -7366,6 +7366,8 @@ +@@ -7455,6 +7455,8 @@ static sqlite3_vfs aVfs[] = { #if SQLITE_ENABLE_LOCKING_STYLE && (OS_VXWORKS || defined(__APPLE__)) UNIXVFS("unix", autolockIoFinder ), |