From: Jonathan A. Kollasch <jakllsch@kollasch.net>
Date: Thu, 17 Apr 2014 17:32:17 +0000 (-0500)
Subject: NetBSD: catch up to <sys/simplelock.h> removal in NetBSD 6.99.x
X-Git-Tag: upstream/1.8.0_pre1^2~483
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=f8ec0c9d559cc61561d0245f133cb162c4b6f6d5;p=packages%2Fo%2Fopenafs.git

NetBSD: catch up to <sys/simplelock.h> removal in NetBSD 6.99.x

Change-Id: I2c663fc426914e978e98c6003419503b57a020d3
Reviewed-on: http://gerrit.openafs.org/11087
Reviewed-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
---

diff --git a/src/afs/sysincludes.h b/src/afs/sysincludes.h
index 10343b867..573fccc88 100644
--- a/src/afs/sysincludes.h
+++ b/src/afs/sysincludes.h
@@ -52,7 +52,7 @@
 # include <sys/timeout.h>
 
 #elif defined(AFS_NBSD40_ENV)
-# ifdef AFS_NBSD50_ENV
+# if defined(AFS_NBSD50_ENV) && !defined(AFS_NBSD70_ENV)
 #  include <sys/simplelock.h>
 # endif
 # include <sys/errno.h>