diff options
| author | Hans-Christoph Steiner <hans@eds.org> | 2013-01-17 14:06:04 -0500 |
|---|---|---|
| committer | Hans-Christoph Steiner <hans@eds.org> | 2013-01-17 14:06:04 -0500 |
| commit | 33384d6735f226cbdb188b00470a9789fdadf95b (patch) | |
| tree | 3c898f61ab6e1301cf6a12018434c428389dcbe6 /debian/patches/20-hurd-locking-style.patch | |
| parent | adc143e8c1ef17a7345506e97298e8619902d747 (diff) | |
grab all relevant patches from sqlite3 3.7.15.2-1
Diffstat (limited to 'debian/patches/20-hurd-locking-style.patch')
| -rw-r--r-- | debian/patches/20-hurd-locking-style.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/debian/patches/20-hurd-locking-style.patch b/debian/patches/20-hurd-locking-style.patch new file mode 100644 index 0000000..cfb3fde --- /dev/null +++ b/debian/patches/20-hurd-locking-style.patch @@ -0,0 +1,38 @@ +--- a/src/os_unix.c ++++ b/src/os_unix.c +@@ -131,7 +131,7 @@ + #endif + + +-#if SQLITE_ENABLE_LOCKING_STYLE ++#if SQLITE_ENABLE_LOCKING_STYLE || defined(__GNU__) + # include <sys/ioctl.h> + # if OS_VXWORKS + # include <semaphore.h> +@@ -2124,7 +2124,7 @@ + ** Omit this section if SQLITE_ENABLE_LOCKING_STYLE is turned off or if + ** compiling for VXWORKS. + */ +-#if SQLITE_ENABLE_LOCKING_STYLE && !OS_VXWORKS ++#if (SQLITE_ENABLE_LOCKING_STYLE && !OS_VXWORKS) || defined(__GNU__) + + /* + ** Retry flock() calls that fail with EINTR +@@ -4531,7 +4531,7 @@ + dotlockCheckReservedLock /* xCheckReservedLock method */ + ) + +-#if SQLITE_ENABLE_LOCKING_STYLE && !OS_VXWORKS ++#if (SQLITE_ENABLE_LOCKING_STYLE && !OS_VXWORKS) || defined(__GNU__) + IOMETHODS( + flockIoFinder, /* Finder function name */ + flockIoMethods, /* sqlite3_io_methods object name */ +@@ -6969,6 +6969,8 @@ + static sqlite3_vfs aVfs[] = { + #if SQLITE_ENABLE_LOCKING_STYLE && (OS_VXWORKS || defined(__APPLE__)) + UNIXVFS("unix", autolockIoFinder ), ++#elif defined(__GNU__) ++ UNIXVFS("unix", flockIoFinder ), + #else + UNIXVFS("unix", posixIoFinder ), + #endif |