diff options
Diffstat (limited to 'sys/netkey/key_debug.h')
| -rw-r--r-- | sys/netkey/key_debug.h | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/sys/netkey/key_debug.h b/sys/netkey/key_debug.h index f75a535..eaa9dd0 100644 --- a/sys/netkey/key_debug.h +++ b/sys/netkey/key_debug.h @@ -1,5 +1,5 @@ /* $FreeBSD$ */ -/* $KAME: key_debug.h,v 1.7 2000/07/04 04:08:16 itojun Exp $ */ +/* $KAME: key_debug.h,v 1.10 2001/08/05 08:37:52 itojun Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -33,8 +33,7 @@ #ifndef _NETKEY_KEY_DEBUG_H_ #define _NETKEY_KEY_DEBUG_H_ -#if !defined(_KERNEL) || (defined(_KERNEL) && defined(IPSEC_DEBUG)) - +#ifdef _KERNEL /* debug flags */ #define KEYDEBUG_STAMP 0x00000001 /* path */ #define KEYDEBUG_DATA 0x00000002 /* data */ @@ -54,9 +53,9 @@ #define KEYDEBUG_IPSEC_DATA (KEYDEBUG_IPSEC | KEYDEBUG_DATA) #define KEYDEBUG_IPSEC_DUMP (KEYDEBUG_IPSEC | KEYDEBUG_DUMP) -#define KEYDEBUG(lev,arg) if ((key_debug_level & (lev)) == (lev)) { arg; } +#define KEYDEBUG(lev,arg) \ + do { if ((key_debug_level & (lev)) == (lev)) { arg; } } while (0) -#ifdef _KERNEL extern u_int32_t key_debug_level; #endif /*_KERNEL*/ @@ -86,10 +85,4 @@ extern void kdebug_sockaddr __P((struct sockaddr *)); extern void ipsec_hexdump __P((caddr_t, int)); extern void ipsec_bindump __P((caddr_t, int)); -#else - -#define KEYDEBUG(lev,arg) - -#endif /*!defined(_KERNEL) || (defined(_KERNEL) && defined(IPSEC_DEBUG))*/ - #endif /* _NETKEY_KEY_DEBUG_H_ */ |
