svn commit: r293093 - user/ngie/stable-10-libnv/sys/cddl/compat/opensolaris/sys
Garrett Cooper
ngie at FreeBSD.org
Sun Jan 3 09:11:57 UTC 2016
Author: ngie
Date: Sun Jan 3 09:11:55 2016
New Revision: 293093
URL: https://svnweb.freebsd.org/changeset/base/293093
Log:
MFC r279437,r284107:
r279437 (by rstone):
Allow Illumos code to co-exist with nv(9)
Suggested by: pjd
r284107 (by avg):
compat nvpair.h: make sure that the names are mangled only for kernel
Currently there is no good reason to mangle the userland API.
The change was introduced in eac1d566b46edef765754203bef22c75c1699966,
r279437. Also see https://reviews.freebsd.org/D1881.
I am still convinced that nv should not have introduced intentionally
conflicting API.
Discussed with: rstone
Added:
user/ngie/stable-10-libnv/sys/cddl/compat/opensolaris/sys/nvpair.h
- copied, changed from r279437, head/sys/cddl/compat/opensolaris/sys/nvpair.h
Modified:
Directory Properties:
user/ngie/stable-10-libnv/ (props changed)
Copied and modified: user/ngie/stable-10-libnv/sys/cddl/compat/opensolaris/sys/nvpair.h (from r279437, head/sys/cddl/compat/opensolaris/sys/nvpair.h)
==============================================================================
--- head/sys/cddl/compat/opensolaris/sys/nvpair.h Sun Mar 1 00:22:45 2015 (r279437, copy source)
+++ user/ngie/stable-10-libnv/sys/cddl/compat/opensolaris/sys/nvpair.h Sun Jan 3 09:11:55 2016 (r293093)
@@ -29,6 +29,8 @@
#ifndef _OPENSOLARIS_SYS_NVPAIR_H_
#define _OPENSOLARIS_SYS_NVPAIR_H_
+#ifdef _KERNEL
+
/*
* Some of the symbols in the Illumos nvpair library conflict with symbols
* provided by nv(9), so we use this preprocessor hack to avoid the conflict.
@@ -254,6 +256,8 @@
#define nvpair_unpack illumos_nvpair_unpack
#define nvpair_unpack_descriptor illumos_nvpair_unpack_descriptor
+#endif /* _KERNEL */
+
#include_next <sys/nvpair.h>
#endif
More information about the svn-src-user
mailing list