summaryrefslogtreecommitdiffstats
path: root/sys/net/zlib.h
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>2013-01-06 14:59:59 +0000
committerpeter <peter@FreeBSD.org>2013-01-06 14:59:59 +0000
commit184da5d83da91fd08fa89f0ea9c2453c3cdf98b7 (patch)
tree190c20652a23327f7044bcb93155bdacb3bc4a71 /sys/net/zlib.h
parent4d844bb92fe4dcdef7ad7d30b87fe471847ea7e5 (diff)
downloadFreeBSD-src-184da5d83da91fd08fa89f0ea9c2453c3cdf98b7.zip
FreeBSD-src-184da5d83da91fd08fa89f0ea9c2453c3cdf98b7.tar.gz
Juggle some internal symbols from our antique zlib (that originally came
in from kernel-pppd which is long gone) so that ZFS and DTRACE play nice. This is a horrible hack to get freefall to compile, and is in dire need of reconciliation. This antique zlib-1.04 code needs to go away.
Diffstat (limited to 'sys/net/zlib.h')
-rw-r--r--sys/net/zlib.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/net/zlib.h b/sys/net/zlib.h
index 44aa425..04941df 100644
--- a/sys/net/zlib.h
+++ b/sys/net/zlib.h
@@ -511,7 +511,7 @@ extern int EXPORT inflateInit OF((z_streamp strm));
*/
#if defined(__FreeBSD__) && defined(_KERNEL)
-#define inflate inflate_ppp /* FreeBSD already has an inflate :-( */
+#define inflate _zlib104_inflate /* FreeBSD already has an inflate :-( */
#endif
extern int EXPORT inflate OF((z_streamp strm, int flush));
OpenPOWER on IntegriCloud