diff options
| author | rodrigc <rodrigc@FreeBSD.org> | 2015-04-22 14:38:58 +0000 |
|---|---|---|
| committer | rodrigc <rodrigc@FreeBSD.org> | 2015-04-22 14:38:58 +0000 |
| commit | 7807fcddc423b01b6c0d930ba53d7c0c95f4e9b2 (patch) | |
| tree | 44c462be8b6eaae71303d84f50c8563dd734b705 /sys/geom | |
| parent | 00a0d8da1075d911901ebeab996e0d46cc9e0922 (diff) | |
| download | FreeBSD-src-7807fcddc423b01b6c0d930ba53d7c0c95f4e9b2.zip FreeBSD-src-7807fcddc423b01b6c0d930ba53d7c0c95f4e9b2.tar.gz | |
Move zlib.c from net to libkern.
It is not network-specific code and would
be better as part of libkern instead.
Move zlib.h and zutil.h from net/ to sys/
Update includes to use sys/zlib.h and sys/zutil.h instead of net/
Submitted by: Steve Kiernan stevek@juniper.net
Obtained from: Juniper Networks, Inc.
GitHub Pull Request: https://github.com/freebsd/freebsd/pull/28
Relnotes: yes
Diffstat (limited to 'sys/geom')
| -rw-r--r-- | sys/geom/uncompress/g_uncompress.c | 2 | ||||
| -rw-r--r-- | sys/geom/uzip/g_uzip.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/geom/uncompress/g_uncompress.c b/sys/geom/uncompress/g_uncompress.c index d819371..8c2d5cb 100644 --- a/sys/geom/uncompress/g_uncompress.c +++ b/sys/geom/uncompress/g_uncompress.c @@ -45,10 +45,10 @@ __FBSDID("$FreeBSD$"); #include <sys/mutex.h> #include <sys/malloc.h> #include <sys/systm.h> +#include <sys/zlib.h> #include <geom/geom.h> -#include <net/zlib.h> #include <contrib/xz-embedded/linux/include/linux/xz.h> #ifdef GEOM_UNCOMPRESS_DEBUG diff --git a/sys/geom/uzip/g_uzip.c b/sys/geom/uzip/g_uzip.c index c2ed64b..732de9d 100644 --- a/sys/geom/uzip/g_uzip.c +++ b/sys/geom/uzip/g_uzip.c @@ -38,9 +38,9 @@ __FBSDID("$FreeBSD$"); #include <sys/malloc.h> #include <sys/sysctl.h> #include <sys/systm.h> +#include <sys/zlib.h> #include <geom/geom.h> -#include <net/zlib.h> FEATURE(geom_uzip, "GEOM uzip read-only compressed disks support"); |
