diff options
author | guido <guido@FreeBSD.org> | 2005-12-30 11:52:26 +0000 |
---|---|---|
committer | guido <guido@FreeBSD.org> | 2005-12-30 11:52:26 +0000 |
commit | 7ee09247502caaf9063c5d6ba733231a70de09ef (patch) | |
tree | 9209f38a8bc3af0186363bc8bbfe05d79337f8d4 /contrib/ipfilter/lib/kmem.c | |
parent | 3cc29e6ebff10906cf1f84a6cc2d518dcecf219c (diff) | |
download | FreeBSD-src-7ee09247502caaf9063c5d6ba733231a70de09ef.zip FreeBSD-src-7ee09247502caaf9063c5d6ba733231a70de09ef.tar.gz |
Resolve conflicts (and believe me...you don't want to know).
Diffstat (limited to 'contrib/ipfilter/lib/kmem.c')
-rw-r--r-- | contrib/ipfilter/lib/kmem.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/contrib/ipfilter/lib/kmem.c b/contrib/ipfilter/lib/kmem.c index 789219e..04a64d1 100644 --- a/contrib/ipfilter/lib/kmem.c +++ b/contrib/ipfilter/lib/kmem.c @@ -18,7 +18,7 @@ #include <string.h> #include <fcntl.h> #include <sys/file.h> -#if !defined(__sgi) && !defined(__hpux) && !defined(__osf__) && !defined(linux) +#if !defined(__sgi) && !defined(__hpux) && !defined(__osf__) && !defined(linux) && !defined(_AIX51) #include <kvm.h> #endif #include <fcntl.h> @@ -44,12 +44,13 @@ #if !defined(lint) static const char sccsid[] = "@(#)kmem.c 1.4 1/12/96 (C) 1992 Darren Reed"; -static const char rcsid[] = "@(#)Id: kmem.c,v 1.16.2.1 2004/06/20 10:25:58 darrenr Exp"; +static const char rcsid[] = "@(#)$Id: kmem.c,v 1.16.2.2 2005/06/12 07:18:41 darrenr Exp $"; #endif -#if !defined(__sgi) && !defined(__hpux) && !defined(__osf__) && !defined(linux) +#if !defined(__sgi) && !defined(__hpux) && !defined(__osf__) && \ + !defined(linux) && !defined(_AIX51) /* * For all platforms where there is a libkvm and a kvm_t, we use that... */ |