diff options
| author | peter <peter@FreeBSD.org> | 2013-01-06 14:59:59 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2013-01-06 14:59:59 +0000 |
| commit | 184da5d83da91fd08fa89f0ea9c2453c3cdf98b7 (patch) | |
| tree | 190c20652a23327f7044bcb93155bdacb3bc4a71 | |
| parent | 4d844bb92fe4dcdef7ad7d30b87fe471847ea7e5 (diff) | |
| download | FreeBSD-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.
| -rw-r--r-- | sys/net/zlib.c | 9 | ||||
| -rw-r--r-- | sys/net/zlib.h | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/sys/net/zlib.c b/sys/net/zlib.c index 8fc8cab..b348248 100644 --- a/sys/net/zlib.c +++ b/sys/net/zlib.c @@ -25,7 +25,14 @@ #define MY_ZCALLOC #if defined(__FreeBSD__) && defined(_KERNEL) -#define inflate inflate_ppp /* FreeBSD already has an inflate :-( */ +#define _tr_init _zlib104_tr_init +#define _tr_align _zlib104_tr_align +#define _tr_tally _zlib104_tr_tally +#define _tr_flush_block _zlib104_tr_flush_block +#define _tr_stored_block _zlib104_tr_stored_block +#define inflate_fast _zlib104_inflate_fast +#define inflate _zlib104_inflate +#define zlibVersion _zlib104_Version #endif 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)); |
