Attachment #158043 for bug #199811

View | Details | Raw Unified | Return to bug 199811
Collapse All | Expand All

Lines 55-61 Link Here

(-)b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c (-1 lines)
55	#include "zfs_prop.h"	55	#include "zfs_prop.h"
56	#include "zfeature_common.h"	56	#include "zfeature_common.h"
57		57
58	int aok;
59		58
60	int	59	int
61	libzfs_errno(libzfs_handle_t *hdl)	60	libzfs_errno(libzfs_handle_t *hdl)

Lines 45-51 Link Here

(-)b/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c (+2 lines)
45	* Emulation of kernel services in userland.	45	* Emulation of kernel services in userland.
46	*/	46	*/
47		47
		48	#ifndef __FreeBSD__
48	int aok;	49	int aok;
		50	#endif
49	uint64_t physmem;	51	uint64_t physmem;
50	vnode_t rootdir = (vnode_t )0xabcd1234;	52	vnode_t rootdir = (vnode_t )0xabcd1234;
51	char hw_serial[HW_HOSTID_LEN];	53	char hw_serial[HW_HOSTID_LEN];

Lines 44-49 Link Here

(-)b/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c (+8 lines)
44	#endif	44	#endif
45	#define skip_whitespace(p) while (((p) == ' ') \|\| ((p) == '\t')) p++	45	#define skip_whitespace(p) while (((p) == ' ') \|\| ((p) == '\t')) p++
46		46
		47	#if defined(__FreeBSD__) && !defined(_KERNEL)
		48	/*
		49	* libnvpair is the lowest commen denominator for ZFS related libraries,
		50	* defining aok here makes it usable by all ZFS related libraries
		51	*/
		52	int aok;
		53	#endif
		54
47	/*	55	/*
48	* nvpair.c - Provides kernel & userland interfaces for manipulating	56	* nvpair.c - Provides kernel & userland interfaces for manipulating
49	* name-value pairs.	57	* name-value pairs.

Return to bug 199811