From owner-svn-src-all@FreeBSD.ORG Sun Jan 6 15:00:00 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 2A7F872C; Sun, 6 Jan 2013 15:00:00 +0000 (UTC) (envelope-from peter@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 1C8BA310; Sun, 6 Jan 2013 15:00:00 +0000 (UTC) Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r06ExxaG082132; Sun, 6 Jan 2013 14:59:59 GMT (envelope-from peter@svn.freebsd.org) Received: (from peter@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r06ExxGl082130; Sun, 6 Jan 2013 14:59:59 GMT (envelope-from peter@svn.freebsd.org) Message-Id: <201301061459.r06ExxGl082130@svn.freebsd.org> From: Peter Wemm Date: Sun, 6 Jan 2013 14:59:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r245102 - head/sys/net X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jan 2013 15:00:00 -0000 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));