head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.26
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.24
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.22
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.20
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.18
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2008Q4:1.2.0.16
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.14
	pkgsrc-2008Q3-base:1.2
	cube-native-xorg:1.2.0.12
	cube-native-xorg-base:1.2
	pkgsrc-2008Q2:1.2.0.10
	pkgsrc-2008Q2-base:1.2
	pkgsrc-2008Q1:1.2.0.8
	pkgsrc-2008Q1-base:1.2
	pkgsrc-2007Q4:1.2.0.6
	pkgsrc-2007Q4-base:1.2
	pkgsrc-2007Q3:1.2.0.4
	pkgsrc-2007Q3-base:1.2
	pkgsrc-2007Q2:1.2.0.2
	pkgsrc-2007Q2-base:1.2
	pkgsrc-2007Q1:1.1.0.4
	pkgsrc-2007Q1-base:1.1
	pkgsrc-2006Q4:1.1.0.2
	pkgsrc-2006Q4-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2007.05.12.15.11.18;	author ghen;	state dead;
branches;
next	1.1;

1.1
date	2006.12.06.20.37.00;	author joerg;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Remove www/firefox2* (copied into www/firefox*).
@
text
@$NetBSD: patch-dw,v 1.1 2006/12/06 20:37:00 joerg 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
@Fix linkage on DragonFly, a segfault in library signing tool and disable
sqlite3 pthread lock test on NetBSD and DragonFly.
@
text
@d1 1
a1 1
$NetBSD$
@