diff options
| author | peter <peter@FreeBSD.org> | 1999-12-29 04:46:21 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1999-12-29 04:46:21 +0000 |
| commit | 15b9bcb121e1f3735a2c98a11afdb52a03301d7e (patch) | |
| tree | e999c95eb5db56737efc17feeb385a77941021bb /sys/netkey/key_debug.c | |
| parent | 9ed7cb48bf4a00a23e7489706b0effe1c516cb5b (diff) | |
| download | FreeBSD-src-15b9bcb121e1f3735a2c98a11afdb52a03301d7e.zip FreeBSD-src-15b9bcb121e1f3735a2c98a11afdb52a03301d7e.tar.gz | |
Change #ifdef KERNEL to #ifdef _KERNEL in the public headers. "KERNEL"
is an application space macro and the applications are supposed to be free
to use it as they please (but cannot). This is consistant with the other
BSD's who made this change quite some time ago. More commits to come.
Diffstat (limited to 'sys/netkey/key_debug.c')
| -rw-r--r-- | sys/netkey/key_debug.c | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/sys/netkey/key_debug.c b/sys/netkey/key_debug.c index ad91068..fc6e3a3 100644 --- a/sys/netkey/key_debug.c +++ b/sys/netkey/key_debug.c @@ -32,19 +32,13 @@ /* KAME @(#)$Id: key_debug.c,v 1.1.6.2.4.3 1999/07/06 12:05:13 itojun Exp $ */ #ifdef _KERNEL -# ifndef KERNEL -# define KERNEL -# endif -#endif - -#ifdef KERNEL #include "opt_inet6.h" #include "opt_ipsec.h" #endif #include <sys/types.h> #include <sys/param.h> -#ifdef KERNEL +#ifdef _KERNEL #include <sys/systm.h> #include <sys/mbuf.h> #endif @@ -59,13 +53,13 @@ #include <netinet6/in6.h> #include <netinet6/ipsec.h> -#if !defined(KERNEL) +#ifndef _KERNEL #include <ctype.h> #include <stdio.h> #include <stdlib.h> -#endif /* defined(KERNEL) */ +#endif -#if !defined(KERNEL) || (defined(KERNEL) && defined(IPSEC_DEBUG)) +#if !defined(_KERNEL) || (defined(_KERNEL) && defined(IPSEC_DEBUG)) static void kdebug_sadb_prop __P((struct sadb_ext *)); static void kdebug_sadb_identity __P((struct sadb_ext *)); @@ -75,11 +69,11 @@ static void kdebug_sadb_sa __P((struct sadb_ext *)); static void kdebug_sadb_address __P((struct sadb_ext *)); static void kdebug_sadb_key __P((struct sadb_ext *)); -#ifdef KERNEL +#ifdef _KERNEL static void kdebug_secreplay __P((struct secreplay *)); #endif -#ifndef KERNEL +#ifndef _KERNEL #define panic(param) { printf(param); exit(-1); } #endif @@ -234,7 +228,7 @@ kdebug_sadb_identity(ext) printf(" type=%d id=%lu", id->sadb_ident_type, (u_long)id->sadb_ident_id); if (len) { -#ifdef KERNEL +#ifdef _KERNEL ipsec_hexdump((caddr_t)(id + 1), len); /*XXX cast ?*/ #else char *p, *ep; @@ -422,7 +416,7 @@ kdebug_sadb_x_policy(ext) return; } -#ifdef KERNEL +#ifdef _KERNEL /* %%%: about SPD and SAD */ void kdebug_secpolicy(sp) @@ -626,7 +620,7 @@ kdebug_mbuf(m0) return; } -#endif /* KERNEL */ +#endif /* _KERNEL */ void kdebug_sockaddr(addr) @@ -655,7 +649,7 @@ kdebug_sockaddr(addr) return; } -#endif /* !defined(KERNEL) || (defined(KERNEL) && defined(IPSEC_DEBUG)) */ +#endif /* !defined(_KERNEL) || (defined(_KERNEL) && defined(IPSEC_DEBUG)) */ void ipsec_bindump(buf, len) |
