diff options
| author | Toomas Soome <tsoome@me.com> | 2020-05-25 15:55:41 +0300 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2020-12-31 09:23:46 +0200 |
| commit | 8247326397b1a16f37e70cf13f5b7a4f50d06712 (patch) | |
| tree | c3d08a0e176a82f5857735d4d048a619725790bb | |
| parent | 436b964b19ef06803ad9165542d80d9d731d6486 (diff) | |
| download | illumos-joyent-8247326397b1a16f37e70cf13f5b7a4f50d06712.tar.gz | |
13403 zfs: symbol 'g_zfs' is multiply-defined
Reviewed by: Robert Mustacchi <rm@fingolfin.org>
Approved by: Richard Lowe <richlowe@richlowe.net>
| -rw-r--r-- | usr/src/cmd/zfs/zfs_util.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr/src/cmd/zfs/zfs_util.h b/usr/src/cmd/zfs/zfs_util.h index 3ddff9e22d..95ca4b76b8 100644 --- a/usr/src/cmd/zfs/zfs_util.h +++ b/usr/src/cmd/zfs/zfs_util.h @@ -31,9 +31,9 @@ extern "C" { #endif -void * safe_malloc(size_t size); -void nomem(void); -libzfs_handle_t *g_zfs; +extern void * safe_malloc(size_t size); +extern void nomem(void); +extern libzfs_handle_t *g_zfs; #ifdef __cplusplus } |