From owner-svn-src-user@FreeBSD.ORG  Sat May 30 00:54:46 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B0880106567B;
	Sat, 30 May 2009 00:54:46 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9EE978FC24;
	Sat, 30 May 2009 00:54:46 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4U0skG2091747;
	Sat, 30 May 2009 00:54:46 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4U0skrk091746;
	Sat, 30 May 2009 00:54:46 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200905300054.n4U0skrk091746@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Sat, 30 May 2009 00:54:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193075 - user/kmacy/releng_7_2_fcs/sys/libkern/zlib
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 30 May 2009 00:54:47 -0000

Author: kmacy
Date: Sat May 30 00:54:46 2009
New Revision: 193075
URL: http://svn.freebsd.org/changeset/base/193075

Log:
  ensure that new zlib resolves module dependencies

Modified:
  user/kmacy/releng_7_2_fcs/sys/libkern/zlib/zutil.c

Modified: user/kmacy/releng_7_2_fcs/sys/libkern/zlib/zutil.c
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/libkern/zlib/zutil.c	Sat May 30 00:22:57 2009	(r193074)
+++ user/kmacy/releng_7_2_fcs/sys/libkern/zlib/zutil.c	Sat May 30 00:54:46 2009	(r193075)
@@ -5,8 +5,20 @@
 
 /* @(#) $Id$ */
 
+
+#ifdef _KERNEL
 #include <libkern/zlib/zutil.h>
 
+/* Assume this is a *BSD or SVR4 kernel */
+#include <sys/types.h>
+#include <sys/time.h>
+#include <sys/systm.h>
+#include <sys/param.h>
+#include <sys/kernel.h>
+#include <sys/module.h>
+#  define HAVE_MEMCPY
+#endif
+
 #ifndef NO_DUMMY_DECL
 struct internal_state      {int dummy;}; /* for buggy compilers */
 #endif
@@ -334,3 +346,25 @@ zcfree(void *opaque, void *ptr)
 
 
 #endif /* MY_ZCALLOC */
+
+#ifdef _KERNEL
+static int
+zlib_modevent(module_t mod, int type, void *unused)
+{
+	switch (type) {
+	case MOD_LOAD:
+		return 0;
+	case MOD_UNLOAD:
+		return 0;
+	}
+	return EINVAL;
+}
+
+static moduledata_t zlib_mod = {
+	"zlib",
+	zlib_modevent,
+	0
+};
+DECLARE_MODULE(zlib, zlib_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST);
+MODULE_VERSION(zlib, 1);
+#endif /* _KERNEL */