summaryrefslogtreecommitdiffstats
path: root/cddl
diff options
context:
space:
mode:
authoravg <avg@FreeBSD.org>2015-10-23 08:01:46 +0000
committeravg <avg@FreeBSD.org>2015-10-23 08:01:46 +0000
commitfbbd0de7f163662e9a98731e9f2d1ef7267e488a (patch)
tree94da9297a2a3a54c09bd5baa36b1009f53b6adee /cddl
parente98221a3c3f53f33d609b0b8caed83d08a28e377 (diff)
downloadFreeBSD-src-fbbd0de7f163662e9a98731e9f2d1ef7267e488a.zip
FreeBSD-src-fbbd0de7f163662e9a98731e9f2d1ef7267e488a.tar.gz
MFC r288340: define aok in libnvpair which is linked to all zfs
libraries that need aok
Diffstat (limited to 'cddl')
-rw-r--r--cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c1
-rw-r--r--cddl/contrib/opensolaris/lib/libzpool/common/kernel.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c
index 3b59914..8ca4738 100644
--- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c
+++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c
@@ -55,7 +55,6 @@
#include "zfs_prop.h"
#include "zfeature_common.h"
-int aok;
int
libzfs_errno(libzfs_handle_t *hdl)
diff --git a/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c b/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
index c61c5c2..5556e6d 100644
--- a/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
+++ b/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
@@ -45,7 +45,9 @@
* Emulation of kernel services in userland.
*/
+#ifndef __FreeBSD__
int aok;
+#endif
uint64_t physmem;
vnode_t *rootdir = (vnode_t *)0xabcd1234;
char hw_serial[HW_HOSTID_LEN];
OpenPOWER on IntegriCloud