d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Juggle some internal symbols from our antique zlib (that originally came

Browse Source 
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.
This commit is contained in:
Peter Wemm 2013-01-06 14:59:59 +00:00
parent 3c35faa333
commit a116ec4b5e
2 changed files with 9 additions and 2 deletions

9
sys/net/zlib.c

@ -25,7 +25,14 @@
#define MY_ZCALLOC #define MY_ZCALLOC
#if defined(__FreeBSD__) && defined(_KERNEL) #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 #endif

2
sys/net/zlib.h

@ -511,7 +511,7 @@ extern int EXPORT inflateInit OF((z_streamp strm));
*/ */
#if defined(__FreeBSD__) && defined(_KERNEL) #if defined(__FreeBSD__) && defined(_KERNEL)
#define inflate inflate_ppp /* FreeBSD already has an inflate :-( */ #define inflate _zlib104_inflate /* FreeBSD already has an inflate :-( */
#endif #endif
extern int EXPORT inflate OF((z_streamp strm, int flush)); extern int EXPORT inflate OF((z_streamp strm, int flush));