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.
This commit is contained in:
parent
3c35faa333
commit
a116ec4b5e
@ -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
|
||||
|
||||
|
||||
|
@ -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));
|
||||
|
Loading…
Reference in New Issue
Block a user