From cddf6d61d133b6269379a650e3b67b5d93751077 Mon Sep 17 00:00:00 2001 From: Kyle Evans Date: Sat, 28 Mar 2020 17:00:38 +0000 Subject: zfs: fix -fno-common issues A similar (or identical?) fix has already landed in OpenZFS. -fno-common will become the default in GCC10/LLVM11. MFC after: 3 days --- cddl/contrib/opensolaris/cmd/zfs/zfs_util.h | 2 +- cddl/contrib/opensolaris/cmd/zpool/zpool_main.c | 2 ++ cddl/contrib/opensolaris/cmd/zpool/zpool_util.h | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) (limited to 'cddl') diff --git a/cddl/contrib/opensolaris/cmd/zfs/zfs_util.h b/cddl/contrib/opensolaris/cmd/zfs/zfs_util.h index 3ddff9e22d7db..a56af59adb154 100644 --- a/cddl/contrib/opensolaris/cmd/zfs/zfs_util.h +++ b/cddl/contrib/opensolaris/cmd/zfs/zfs_util.h @@ -33,7 +33,7 @@ extern "C" { void * safe_malloc(size_t size); void nomem(void); -libzfs_handle_t *g_zfs; +extern libzfs_handle_t *g_zfs; #ifdef __cplusplus } diff --git a/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c b/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c index d4e0a73ade67d..414f26756acd0 100644 --- a/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c +++ b/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c @@ -64,6 +64,8 @@ #include "statcommon.h" +libzfs_handle_t *g_zfs; + static int zpool_do_create(int, char **); static int zpool_do_destroy(int, char **); diff --git a/cddl/contrib/opensolaris/cmd/zpool/zpool_util.h b/cddl/contrib/opensolaris/cmd/zpool/zpool_util.h index 8777edc9de177..118029a228667 100644 --- a/cddl/contrib/opensolaris/cmd/zpool/zpool_util.h +++ b/cddl/contrib/opensolaris/cmd/zpool/zpool_util.h @@ -64,7 +64,7 @@ void pool_list_free(zpool_list_t *); int pool_list_count(zpool_list_t *); void pool_list_remove(zpool_list_t *, zpool_handle_t *); -libzfs_handle_t *g_zfs; +extern libzfs_handle_t *g_zfs; #ifdef __cplusplus } -- cgit v1.2.3