svn commit: r245102 - head/sys/net

Peter Wemm peter at FreeBSD.org
Sun Jan 6 15:00:00 UTC 2013


Author: peter
Date: Sun Jan  6 14:59:59 2013
New Revision: 245102
URL: http://svnweb.freebsd.org/changeset/base/245102

Log:
  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.

Modified:
  head/sys/net/zlib.c
  head/sys/net/zlib.h

Modified: head/sys/net/zlib.c
==============================================================================
--- head/sys/net/zlib.c	Sun Jan  6 07:14:04 2013	(r245101)
+++ head/sys/net/zlib.c	Sun Jan  6 14:59:59 2013	(r245102)
@@ -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
 
 

Modified: head/sys/net/zlib.h
==============================================================================
--- head/sys/net/zlib.h	Sun Jan  6 07:14:04 2013	(r245101)
+++ head/sys/net/zlib.h	Sun Jan  6 14:59:59 2013	(r245102)
@@ -511,7 +511,7 @@ extern int EXPORT inflateInit OF((z_stre
 */
 
 #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));


More information about the svn-src-all mailing list