From e5dc681a50a41d42c18b52abc8d5a3c2a357bdaa Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Thu, 26 Aug 2010 09:52:40 -0700 Subject: Fix gcc ident pragma warnings Remove all ident pragmas which are unknown to gcc. Signed-off-by: Brian Behlendorf --- lib/libefi/include/sys/efi_partition.h | 4 ++++ lib/libefi/include/sys/uuid.h | 2 -- lib/libnvpair/nvpair_alloc_system.c | 2 +- lib/libuutil/include/libuutil_common.h | 2 +- lib/libuutil/include/libuutil_impl.h | 6 +++--- lib/libuutil/uu_avl.c | 2 +- lib/libuutil/uu_dprintf.c | 2 +- lib/libuutil/uu_ident.c | 2 +- lib/libuutil/uu_list.c | 2 +- lib/libuutil/uu_open.c | 2 +- lib/libuutil/uu_pname.c | 2 +- lib/libuutil/uu_strtoint.c | 2 +- 12 files changed, 16 insertions(+), 14 deletions(-) (limited to 'lib') 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 #include 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 #include 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 #include @@ -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" -- cgit v1.2.3