Date: Sat, 30 May 2009 00:54:46 +0000 (UTC) From: Kip Macy <kmacy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r193075 - user/kmacy/releng_7_2_fcs/sys/libkern/zlib Message-ID: <200905300054.n4U0skrk091746@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200905300054.n4U0skrk091746>