Mercurial > illumos > git > illumos-joyent

changeset 25630:e378f6e9c1a6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
13403 zfs: symbol 'g_zfs' is multiply-defined Reviewed by: Robert Mustacchi <rm@fingolfin.org> Approved by: Richard Lowe <richlowe@richlowe.net>
author Toomas Soome <tsoome@me.com>
date Mon, 25 May 2020 15:55:41 +0300
parents 2dae6825d710
children 08f69c404c58
files usr/src/cmd/zfs/zfs_util.h
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/cmd/zfs/zfs_util.h	Mon May 25 16:59:53 2020 +0300
+++ b/usr/src/cmd/zfs/zfs_util.h	Mon May 25 15:55:41 2020 +0300
@@ -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
 }