From owner-svn-src-all@FreeBSD.ORG  Mon Apr 30 23:12:16 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B1B93106564A;
	Mon, 30 Apr 2012 23:12:16 +0000 (UTC) (envelope-from rmh@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9D0758FC15;
	Mon, 30 Apr 2012 23:12:16 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3UNCGQd089974;
	Mon, 30 Apr 2012 23:12:16 GMT (envelope-from rmh@svn.freebsd.org)
Received: (from rmh@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3UNCG8p089972;
	Mon, 30 Apr 2012 23:12:16 GMT (envelope-from rmh@svn.freebsd.org)
Message-Id: <201204302312.q3UNCG8p089972@svn.freebsd.org>
From: Robert Millan <rmh@FreeBSD.org>
Date: Mon, 30 Apr 2012 23:12:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234856 - head/cddl/compat/opensolaris/include
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Mon, 30 Apr 2012 23:12:16 -0000

Author: rmh
Date: Mon Apr 30 23:12:16 2012
New Revision: 234856
URL: http://svn.freebsd.org/changeset/base/234856

Log:
  GNU/kFreeBSD portability fix. This glue <stdlib.h> overrides header protection
  in the system-wide version of <stdlib.h> by wrapping the #include_next
  <stdlib.h> within the scope of its own header protection. On FreeBSD this has
  no effect, since both header protections are equivalent. However the GNU version
  of <stdlib.h> implements a special header protection mechanism which allows it
  to be included multiple times (in different modes).
  
  Simply by moving the #include_next off the header protection, we allow
  system-wide <stdlib.h> to implement its own protection policy, whichever that
  may be.

Modified:
  head/cddl/compat/opensolaris/include/stdlib.h

Modified: head/cddl/compat/opensolaris/include/stdlib.h
==============================================================================
--- head/cddl/compat/opensolaris/include/stdlib.h	Mon Apr 30 22:46:09 2012	(r234855)
+++ head/cddl/compat/opensolaris/include/stdlib.h	Mon Apr 30 23:12:16 2012	(r234856)
@@ -27,11 +27,11 @@
  *
  */
 
+#include_next <stdlib.h>
+
 #ifndef _COMPAT_OPENSOLARIS_STDLIB_H_
 #define _COMPAT_OPENSOLARIS_STDLIB_H_
 
-#include_next <stdlib.h>
-
 #define getexecname	getprogname
 
 #endif