diff options
| author | Matthew Macy <[email protected]> | 2019-12-04 13:12:57 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2019-12-04 13:12:57 -0800 |
| commit | be627fc84711d2382d179392e3313f9fda8d24a3 (patch) | |
| tree | 682926e925cdbd5bad6df0d2a8f16c48ec9ca7e3 /lib/libspl | |
| parent | 618b6adfbf136b3b61c6366719650ccfbad189a4 (diff) | |
Refactor zfs_context.h to build on FreeBSD
- on Linux move Linux specific headers to zfs_context_os.h
- on FreeBSD move FreeBSD specific definitions to zfs_context_os.h
- remove duplicate tsd_ definitions
- remove unused AT_TYPE
Reviewed-by: Jorgen Lundman <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: Don Brady <[email protected]>
Signed-off-by: Matt Macy <[email protected]>
Closes #9668
Diffstat (limited to 'lib/libspl')
| -rw-r--r-- | lib/libspl/include/os/linux/sys/Makefile.am | 3 | ||||
| -rw-r--r-- | lib/libspl/include/os/linux/sys/zfs_context_os.h (renamed from lib/libspl/include/sys/bitmap.h) | 9 | ||||
| -rw-r--r-- | lib/libspl/include/sys/Makefile.am | 1 |
3 files changed, 4 insertions, 9 deletions
diff --git a/lib/libspl/include/os/linux/sys/Makefile.am b/lib/libspl/include/os/linux/sys/Makefile.am index f8b6d9fae..49e9f730e 100644 --- a/lib/libspl/include/os/linux/sys/Makefile.am +++ b/lib/libspl/include/os/linux/sys/Makefile.am @@ -7,4 +7,5 @@ libspl_HEADERS = \ $(top_srcdir)/lib/libspl/include/os/linux/sys/param.h \ $(top_srcdir)/lib/libspl/include/os/linux/sys/stat.h \ $(top_srcdir)/lib/libspl/include/os/linux/sys/sysmacros.h \ - $(top_srcdir)/lib/libspl/include/os/linux/sys/uio.h + $(top_srcdir)/lib/libspl/include/os/linux/sys/uio.h \ + $(top_srcdir)/lib/libspl/include/os/linux/sys/zfs_context_os.h diff --git a/lib/libspl/include/sys/bitmap.h b/lib/libspl/include/os/linux/sys/zfs_context_os.h index 95122ab8b..008e57df4 100644 --- a/lib/libspl/include/sys/bitmap.h +++ b/lib/libspl/include/os/linux/sys/zfs_context_os.h @@ -19,12 +19,7 @@ * * CDDL HEADER END */ -/* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#ifndef _LIBSPL_SYS_BITMAP_H -#define _LIBSPL_SYS_BITMAP_H +#ifndef ZFS_CONTEXT_OS_H +#define ZFS_CONTEXT_OS_H #endif diff --git a/lib/libspl/include/sys/Makefile.am b/lib/libspl/include/sys/Makefile.am index a83fc025e..8f9c2fa99 100644 --- a/lib/libspl/include/sys/Makefile.am +++ b/lib/libspl/include/sys/Makefile.am @@ -4,7 +4,6 @@ libspldir = $(includedir)/libspl/sys libspl_HEADERS = \ $(top_srcdir)/lib/libspl/include/sys/acl.h \ $(top_srcdir)/lib/libspl/include/sys/acl_impl.h \ - $(top_srcdir)/lib/libspl/include/sys/bitmap.h \ $(top_srcdir)/lib/libspl/include/sys/callb.h \ $(top_srcdir)/lib/libspl/include/sys/cmn_err.h \ $(top_srcdir)/lib/libspl/include/sys/cred.h \ |