Index: stable/11/contrib/ipfilter/lib/kmem.h
===================================================================
--- stable/11/contrib/ipfilter/lib/kmem.h	(revision 367153)
+++ stable/11/contrib/ipfilter/lib/kmem.h	(revision 367154)
@@ -1,34 +1,34 @@
 /*	$FreeBSD$	*/
 
 /*
  * Copyright (C) 2012 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  * $Id$
  */
 
 #ifndef	__KMEM_H__
 #define	__KMEM_H__
 
 #ifndef	__P
 # ifdef	__STDC__
 #  define	__P(x)	x
 # else
 #  define	__P(x)	()
 # endif
 #endif
 extern	int	openkmem __P((char *, char *));
 extern	int	kmemcpy __P((char *, long, int));
 extern	int	kstrncpy __P((char *, long, int));
 
-#if defined(__NetBSD__) || defined(__OpenBSD)
+#if defined(__NetBSD__)
 # include <paths.h>
 #endif
 
 #ifdef _PATH_KMEM
 # define	KMEM	_PATH_KMEM
 #else
 # define	KMEM	"/dev/kmem"
 #endif
 
 #endif /* __KMEM_H__ */
Index: stable/11
===================================================================
--- stable/11	(revision 367153)
+++ stable/11	(revision 367154)

Property changes on: stable/11
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r367069
Index: stable/12/contrib/ipfilter/lib/kmem.h
===================================================================
--- stable/12/contrib/ipfilter/lib/kmem.h	(revision 367153)
+++ stable/12/contrib/ipfilter/lib/kmem.h	(revision 367154)
@@ -1,34 +1,34 @@
 /*	$FreeBSD$	*/
 
 /*
  * Copyright (C) 2012 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  * $Id$
  */
 
 #ifndef	__KMEM_H__
 #define	__KMEM_H__
 
 #ifndef	__P
 # ifdef	__STDC__
 #  define	__P(x)	x
 # else
 #  define	__P(x)	()
 # endif
 #endif
 extern	int	openkmem __P((char *, char *));
 extern	int	kmemcpy __P((char *, long, int));
 extern	int	kstrncpy __P((char *, long, int));
 
-#if defined(__NetBSD__) || defined(__OpenBSD)
+#if defined(__NetBSD__)
 # include <paths.h>
 #endif
 
 #ifdef _PATH_KMEM
 # define	KMEM	_PATH_KMEM
 #else
 # define	KMEM	"/dev/kmem"
 #endif
 
 #endif /* __KMEM_H__ */
Index: stable/12
===================================================================
--- stable/12	(revision 367153)
+++ stable/12	(revision 367154)

Property changes on: stable/12
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r367069