michael@121: Index: mutex/mut_fcntl.c
michael@121: --- mutex/mut_fcntl.c.orig	2008-01-08 21:58:43 +0100
michael@121: +++ mutex/mut_fcntl.c	2008-05-26 22:36:45 +0200
michael@121: @@ -84,7 +84,7 @@
michael@121:  
michael@121:  		/* Acquire an exclusive kernel lock. */
michael@121:  		k_lock.l_type = F_WRLCK;
michael@121: -		if (fcntl(env->lockfhp->fd, F_SETLKW, &k_lock))
michael@121: +		if (fcntl(env->lockfhp->fd, F_SETLKW, &k_lock) == -1)
michael@121:  			goto err;
michael@121:  
michael@121:  		/* If the resource is still available, it's ours. */
michael@121: @@ -97,7 +97,7 @@
michael@121:  
michael@121:  		/* Release the kernel lock. */
michael@121:  		k_lock.l_type = F_UNLCK;
michael@121: -		if (fcntl(env->lockfhp->fd, F_SETLK, &k_lock))
michael@121: +		if (fcntl(env->lockfhp->fd, F_SETLK, &k_lock) == -1)
michael@121:  			goto err;
michael@121:  
michael@121:  		/*
michael@121: Index: os/os_open.c
michael@121: --- os/os_open.c.orig	2008-03-26 05:11:35 +0100
michael@121: +++ os/os_open.c	2008-05-26 22:36:05 +0200
michael@121: @@ -67,7 +67,7 @@
michael@121:  	if (LF_ISSET(DB_OSO_EXCL))
michael@121:  		oflags |= O_EXCL;
michael@121:  
michael@121: -#ifdef HAVE_O_DIRECT
michael@121: +#if defined(HAVE_O_DIRECT) && defined(__FreeBSD__)
michael@121:  	if (LF_ISSET(DB_OSO_DIRECT))
michael@121:  		oflags |= O_DIRECT;
michael@121:  #endif