From owner-svn-src-all@FreeBSD.ORG  Sun Jun  7 08:54:26 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 2491ED5F;
 Sun,  7 Jun 2015 08:54:26 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 122BA1B37;
 Sun,  7 Jun 2015 08:54:26 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t578sP9F012093;
 Sun, 7 Jun 2015 08:54:25 GMT (envelope-from avg@FreeBSD.org)
Received: (from avg@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t578sPdR012092;
 Sun, 7 Jun 2015 08:54:25 GMT (envelope-from avg@FreeBSD.org)
Message-Id: <201506070854.t578sPdR012092@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: avg set sender to avg@FreeBSD.org
 using -f
From: Andriy Gapon <avg@FreeBSD.org>
Date: Sun, 7 Jun 2015 08:54:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r284107 - head/sys/cddl/compat/opensolaris/sys
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 07 Jun 2015 08:54:26 -0000

Author: avg
Date: Sun Jun  7 08:54:25 2015
New Revision: 284107
URL: https://svnweb.freebsd.org/changeset/base/284107

Log:
  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
  X-MFC with:	r279437
  Sponsored by:	ClusterHQ

Modified:
  head/sys/cddl/compat/opensolaris/sys/nvpair.h

Modified: head/sys/cddl/compat/opensolaris/sys/nvpair.h
==============================================================================
--- head/sys/cddl/compat/opensolaris/sys/nvpair.h	Sun Jun  7 06:30:25 2015	(r284106)
+++ head/sys/cddl/compat/opensolaris/sys/nvpair.h	Sun Jun  7 08:54:25 2015	(r284107)
@@ -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