800ce59e41
and change notes). Firefox 1.5.0.x will be maintained in www/firefox15*, as discussed on tech-pkg.
32 lines
1,023 B
Text
32 lines
1,023 B
Text
$NetBSD: patch-dw,v 1.4 2007/05/12 13:53:11 ghen Exp $
|
|
|
|
--- db/sqlite3/src/os_unix.c.orig 2006-05-22 19:12:32.000000000 +0000
|
|
+++ db/sqlite3/src/os_unix.c
|
|
@@ -443,6 +443,7 @@ static int lockTrace(int fd, int op, str
|
|
#define fcntl lockTrace
|
|
#endif /* SQLITE_LOCK_TRACE */
|
|
|
|
+#if SQLITE_THREAD_OVERRIDE_LOCK == -1
|
|
/*
|
|
** The testThreadLockingBehavior() routine launches two separate
|
|
** threads on this routine. This routine attempts to lock a file
|
|
@@ -483,6 +484,7 @@ static void testThreadLockingBehavior(in
|
|
close(fd);
|
|
threadsOverrideEachOthersLocks = d[0].result==0 && d[1].result==0;
|
|
}
|
|
+#endif
|
|
#endif /* SQLITE_UNIX_THREADS */
|
|
|
|
/*
|
|
@@ -536,9 +538,11 @@ static int findLockInfo(
|
|
key1.dev = statbuf.st_dev;
|
|
key1.ino = statbuf.st_ino;
|
|
#ifdef SQLITE_UNIX_THREADS
|
|
+#if SQLITE_THREAD_OVERRIDE_LOCK == -1
|
|
if( threadsOverrideEachOthersLocks<0 ){
|
|
testThreadLockingBehavior(fd);
|
|
}
|
|
+#endif
|
|
key1.tid = threadsOverrideEachOthersLocks ? 0 : pthread_self();
|
|
#endif
|
|
memset(&key2, 0, sizeof(key2));
|