From owner-svn-src-user@freebsd.org  Sun Jan  3 09:11:57 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 040FEA5F3E6
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Sun,  3 Jan 2016 09:11:57 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C12751FD2;
 Sun,  3 Jan 2016 09:11:56 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u039BtK1028928;
 Sun, 3 Jan 2016 09:11:55 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u039BttL028927;
 Sun, 3 Jan 2016 09:11:55 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201601030911.u039BttL028927@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Sun, 3 Jan 2016 09:11:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r293093 -
 user/ngie/stable-10-libnv/sys/cddl/compat/opensolaris/sys
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 03 Jan 2016 09:11:57 -0000

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