head 1.2; access; symbols pkgsrc-2013Q2:1.2.0.8 pkgsrc-2013Q2-base:1.2 pkgsrc-2012Q4:1.2.0.6 pkgsrc-2012Q4-base:1.2 pkgsrc-2011Q4:1.2.0.4 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q2:1.2.0.2 pkgsrc-2011Q2-base:1.2 pkgsrc-2010Q1:1.1.1.1.0.4 pkgsrc-2010Q1-base:1.1.1.1 pkgsrc-2009Q4:1.1.1.1.0.2 pkgsrc-2009Q4-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.2 date 2010.04.21.16.59.29; author tnn; state dead; branches; next 1.1; 1.1 date 2009.11.28.21.59.56; author tnn; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2009.11.28.21.59.56; author tnn; state Exp; branches; next ; desc @@ 1.2 log @remove thunderbird2. Mozilla says no more 2.x releases planned. @ text @$NetBSD: patch-dx,v 1.1 2009/11/28 21:59:56 tnn 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)); @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD: patch-dx,v 1.1 2007/06/15 16:11:42 joerg Exp $ @ 1.1.1.1 log @Re-import mail/thunderbird as mail/thunderbird2 to let mail/thunderbird become the natural upgrade path to thunderbird 3.0. @ text @@