diff options
26 files changed, 30 insertions, 28 deletions
diff --git a/cmd/zpool/zpool_iter.c b/cmd/zpool/zpool_iter.c index 2f0daefd5..bf947d307 100644 --- a/cmd/zpool/zpool_iter.c +++ b/cmd/zpool/zpool_iter.c @@ -23,7 +23,7 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" + #include <libintl.h> #include <libuutil.h> diff --git a/lib/libefi/include/sys/efi_partition.h b/lib/libefi/include/sys/efi_partition.h index 4ffa42211..ff38df5e7 100644 --- a/lib/libefi/include/sys/efi_partition.h +++ b/lib/libefi/include/sys/efi_partition.h @@ -218,7 +218,11 @@ struct partition64 { /* * Number of EFI partitions */ +#if defined(__linux__) +#define EFI_NUMPAR 128 /* Expected by parted-1.8.1 */ +#else #define EFI_NUMPAR 9 +#endif #ifndef _KERNEL extern int efi_alloc_and_init(int, uint32_t, struct dk_gpt **); diff --git a/lib/libefi/include/sys/uuid.h b/lib/libefi/include/sys/uuid.h index 683643e31..9ce872e34 100644 --- a/lib/libefi/include/sys/uuid.h +++ b/lib/libefi/include/sys/uuid.h @@ -27,8 +27,6 @@ #ifndef _SYS_UUID_H #define _SYS_UUID_H -#pragma ident "%Z%%M% %I% %E% SMI" - #ifdef __cplusplus extern "C" { #endif diff --git a/lib/libnvpair/nvpair_alloc_system.c b/lib/libnvpair/nvpair_alloc_system.c index e76557795..f45dc5f0b 100644 --- a/lib/libnvpair/nvpair_alloc_system.c +++ b/lib/libnvpair/nvpair_alloc_system.c @@ -24,7 +24,7 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" + #include <rpc/types.h> #include <sys/nvpair.h> diff --git a/lib/libuutil/include/libuutil_common.h b/lib/libuutil/include/libuutil_common.h index 9ebaaedfd..52ac4887f 100644 --- a/lib/libuutil/include/libuutil_common.h +++ b/lib/libuutil/include/libuutil_common.h @@ -27,7 +27,7 @@ #ifndef _LIBUUTIL_COMMON_H #define _LIBUUTIL_COMMON_H -#pragma ident "%Z%%M% %I% %E% SMI" + #include <libuutil.h> #include <libuutil_impl.h> diff --git a/lib/libuutil/include/libuutil_impl.h b/lib/libuutil/include/libuutil_impl.h index 9466e5974..f978b475e 100644 --- a/lib/libuutil/include/libuutil_impl.h +++ b/lib/libuutil/include/libuutil_impl.h @@ -27,7 +27,7 @@ #ifndef _LIBUUTIL_IMPL_H #define _LIBUUTIL_IMPL_H -#pragma ident "%Z%%M% %I% %E% SMI" + #include <libuutil.h> #include <pthread.h> @@ -40,11 +40,11 @@ extern "C" { #endif void uu_set_error(uint_t); -#pragma rarely_called(uu_set_error) + /*PRINTFLIKE1*/ void uu_panic(const char *format, ...); -#pragma rarely_called(uu_panic) + struct uu_dprintf { char *uud_name; diff --git a/lib/libuutil/uu_avl.c b/lib/libuutil/uu_avl.c index 308e9208f..040008883 100644 --- a/lib/libuutil/uu_avl.c +++ b/lib/libuutil/uu_avl.c @@ -23,7 +23,7 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" + #include "libuutil_common.h" diff --git a/lib/libuutil/uu_dprintf.c b/lib/libuutil/uu_dprintf.c index 5b990a52b..5d5fb84a8 100644 --- a/lib/libuutil/uu_dprintf.c +++ b/lib/libuutil/uu_dprintf.c @@ -24,7 +24,7 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" + #include "libuutil_common.h" diff --git a/lib/libuutil/uu_ident.c b/lib/libuutil/uu_ident.c index 9a643845f..382139316 100644 --- a/lib/libuutil/uu_ident.c +++ b/lib/libuutil/uu_ident.c @@ -24,7 +24,7 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" + #include "libuutil_common.h" diff --git a/lib/libuutil/uu_list.c b/lib/libuutil/uu_list.c index 35c7ba800..c3a447d01 100644 --- a/lib/libuutil/uu_list.c +++ b/lib/libuutil/uu_list.c @@ -23,7 +23,7 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" + #include "libuutil_common.h" diff --git a/lib/libuutil/uu_open.c b/lib/libuutil/uu_open.c index 7256662e3..cf5c5450b 100644 --- a/lib/libuutil/uu_open.c +++ b/lib/libuutil/uu_open.c @@ -24,7 +24,7 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" + #include "libuutil_common.h" diff --git a/lib/libuutil/uu_pname.c b/lib/libuutil/uu_pname.c index 3307a26dc..a6a0f2266 100644 --- a/lib/libuutil/uu_pname.c +++ b/lib/libuutil/uu_pname.c @@ -24,7 +24,7 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" + #include "libuutil_common.h" diff --git a/lib/libuutil/uu_strtoint.c b/lib/libuutil/uu_strtoint.c index 8fd114836..494e0a5b9 100644 --- a/lib/libuutil/uu_strtoint.c +++ b/lib/libuutil/uu_strtoint.c @@ -24,7 +24,7 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" + #include "libuutil_common.h" diff --git a/module/avl/include/sys/avl_impl.h b/module/avl/include/sys/avl_impl.h index 620685f37..fddf76906 100644 --- a/module/avl/include/sys/avl_impl.h +++ b/module/avl/include/sys/avl_impl.h @@ -27,7 +27,7 @@ #ifndef _AVL_IMPL_H #define _AVL_IMPL_H -#pragma ident "%Z%%M% %I% %E% SMI" + /* * This is a private header file. Applications should not directly include diff --git a/module/nvpair/include/sys/nvpair_impl.h b/module/nvpair/include/sys/nvpair_impl.h index f12dbbfe6..b851ddd54 100644 --- a/module/nvpair/include/sys/nvpair_impl.h +++ b/module/nvpair/include/sys/nvpair_impl.h @@ -27,7 +27,7 @@ #ifndef _NVPAIR_IMPL_H #define _NVPAIR_IMPL_H -#pragma ident "%Z%%M% %I% %E% SMI" + #ifdef __cplusplus extern "C" { diff --git a/module/nvpair/nvpair_alloc_fixed.c b/module/nvpair/nvpair_alloc_fixed.c index b1128eeb9..33e3c0d00 100644 --- a/module/nvpair/nvpair_alloc_fixed.c +++ b/module/nvpair/nvpair_alloc_fixed.c @@ -24,7 +24,7 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" + #include <sys/stropts.h> #include <sys/isa_defs.h> diff --git a/module/unicode/include/sys/u8_textprep.h b/module/unicode/include/sys/u8_textprep.h index e30f064b2..f8b5bed6e 100644 --- a/module/unicode/include/sys/u8_textprep.h +++ b/module/unicode/include/sys/u8_textprep.h @@ -26,7 +26,7 @@ #ifndef _SYS_U8_TEXTPREP_H #define _SYS_U8_TEXTPREP_H -#pragma ident "%Z%%M% %I% %E% SMI" + #include <sys/isa_defs.h> #include <sys/types.h> diff --git a/module/unicode/include/sys/u8_textprep_data.h b/module/unicode/include/sys/u8_textprep_data.h index de6866096..03f71f26c 100644 --- a/module/unicode/include/sys/u8_textprep_data.h +++ b/module/unicode/include/sys/u8_textprep_data.h @@ -68,7 +68,7 @@ #ifndef _SYS_U8_TEXTPREP_DATA_H #define _SYS_U8_TEXTPREP_DATA_H -#pragma ident "%Z%%M% %I% %E% SMI" + #include <sys/types.h> diff --git a/module/unicode/u8_textprep.c b/module/unicode/u8_textprep.c index 8faf1a97e..34b0b9a8b 100644 --- a/module/unicode/u8_textprep.c +++ b/module/unicode/u8_textprep.c @@ -23,7 +23,7 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" + /* diff --git a/module/unicode/uconv.c b/module/unicode/uconv.c index fd65fc99b..b996e1f60 100644 --- a/module/unicode/uconv.c +++ b/module/unicode/uconv.c @@ -23,7 +23,7 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" + /* * Unicode encoding conversion functions among UTF-8, UTF-16, and UTF-32. diff --git a/module/zfs/gzip.c b/module/zfs/gzip.c index b257d4af7..aa0254806 100644 --- a/module/zfs/gzip.c +++ b/module/zfs/gzip.c @@ -24,7 +24,7 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" + #include <sys/debug.h> #include <sys/types.h> diff --git a/module/zfs/include/sys/rrwlock.h b/module/zfs/include/sys/rrwlock.h index 19a43c97f..798a015d1 100644 --- a/module/zfs/include/sys/rrwlock.h +++ b/module/zfs/include/sys/rrwlock.h @@ -26,7 +26,7 @@ #ifndef _SYS_RR_RW_LOCK_H #define _SYS_RR_RW_LOCK_H -#pragma ident "%Z%%M% %I% %E% SMI" + #ifdef __cplusplus extern "C" { diff --git a/module/zfs/include/sys/unique.h b/module/zfs/include/sys/unique.h index 2ef3093ed..d97175286 100644 --- a/module/zfs/include/sys/unique.h +++ b/module/zfs/include/sys/unique.h @@ -26,7 +26,7 @@ #ifndef _SYS_UNIQUE_H #define _SYS_UNIQUE_H -#pragma ident "%Z%%M% %I% %E% SMI" + #include <sys/zfs_context.h> diff --git a/module/zfs/include/sys/vdev_file.h b/module/zfs/include/sys/vdev_file.h index cd4967357..b4d40f9df 100644 --- a/module/zfs/include/sys/vdev_file.h +++ b/module/zfs/include/sys/vdev_file.h @@ -27,7 +27,7 @@ #ifndef _SYS_VDEV_FILE_H #define _SYS_VDEV_FILE_H -#pragma ident "%Z%%M% %I% %E% SMI" + #include <sys/vdev.h> diff --git a/module/zfs/include/sys/zfs_rlock.h b/module/zfs/include/sys/zfs_rlock.h index f302b663e..722c341e2 100644 --- a/module/zfs/include/sys/zfs_rlock.h +++ b/module/zfs/include/sys/zfs_rlock.h @@ -26,7 +26,7 @@ #ifndef _SYS_FS_ZFS_RLOCK_H #define _SYS_FS_ZFS_RLOCK_H -#pragma ident "%Z%%M% %I% %E% SMI" + #ifdef __cplusplus extern "C" { diff --git a/module/zfs/unique.c b/module/zfs/unique.c index fbe7b619a..8c1d2e2f9 100644 --- a/module/zfs/unique.c +++ b/module/zfs/unique.c @@ -23,7 +23,7 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" + #include <sys/zfs_context.h> #include <sys/avl.h> |