summaryrefslogtreecommitdiffstats
path: root/sys/net/zlib.c
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>1999-12-29 04:46:21 +0000
committerpeter <peter@FreeBSD.org>1999-12-29 04:46:21 +0000
commit15b9bcb121e1f3735a2c98a11afdb52a03301d7e (patch)
treee999c95eb5db56737efc17feeb385a77941021bb /sys/net/zlib.c
parent9ed7cb48bf4a00a23e7489706b0effe1c516cb5b (diff)
downloadFreeBSD-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/net/zlib.c')
-rw-r--r--sys/net/zlib.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/net/zlib.c b/sys/net/zlib.c
index 64c4ad0..19df859 100644
--- a/sys/net/zlib.c
+++ b/sys/net/zlib.c
@@ -24,7 +24,7 @@
#define NO_ZCFUNCS
#define MY_ZCALLOC
-#if defined(__FreeBSD__) && (defined(KERNEL) || defined(_KERNEL))
+#if defined(__FreeBSD__) && defined(_KERNEL)
#define inflate inflate_ppp /* FreeBSD already has an inflate :-( */
#endif
@@ -45,13 +45,13 @@
#ifndef _Z_UTIL_H
#define _Z_UTIL_H
-#ifdef KERNEL
+#ifdef _KERNEL
#include <net/zlib.h>
#else
#include "zlib.h"
#endif
-#if defined(KERNEL) || defined(_KERNEL)
+#ifdef _KERNEL
/* Assume this is a *BSD or SVR4 kernel */
#include <sys/types.h>
#include <sys/time.h>
@@ -80,7 +80,7 @@
# include <stdlib.h>
#endif
#endif /* __KERNEL__ */
-#endif /* _KERNEL || KERNEL */
+#endif /* _KERNEL */
#ifndef local
# define local static
OpenPOWER on IntegriCloud