From owner-svn-src-head@FreeBSD.ORG  Mon May 11 21:13:01 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3203E1065674;
	Mon, 11 May 2009 21:13:01 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2136C8FC17;
	Mon, 11 May 2009 21:13:01 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4BLD1Km002290;
	Mon, 11 May 2009 21:13:01 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4BLD1YW002289;
	Mon, 11 May 2009 21:13:01 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <200905112113.n4BLD1YW002289@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Mon, 11 May 2009 21:13:01 +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: r192002 - head/sys/sys
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 11 May 2009 21:13:01 -0000

Author: jhb
Date: Mon May 11 21:13:00 2009
New Revision: 192002
URL: http://svn.freebsd.org/changeset/base/192002

Log:
  *sigh*, while the kernel built, userland C did not.  Revert the previous
  commit and fix it correctly by removing the _KERNEL check entirely.  Now
  the kernel always sees the same value of NULL as userland meaning that it
  sees __null, 0, or 0L when compiled as C++, and '(void *)0' when compiled
  as C.

Modified:
  head/sys/sys/_null.h

Modified: head/sys/sys/_null.h
==============================================================================
--- head/sys/sys/_null.h	Mon May 11 19:58:03 2009	(r192001)
+++ head/sys/sys/_null.h	Mon May 11 21:13:00 2009	(r192002)
@@ -28,18 +28,18 @@
 
 #ifndef NULL
 
+#if !defined(__cplusplus)
+#define	NULL	((void *)0)
+#else
 #if defined(__GNUG__) && defined(__GNUC__) && __GNUC__ >= 4
 #define	NULL	__null
 #else
-#if defined(_KERNEL) && !defined(__cplusplus)
-#define	NULL	((void *)0)
-#else
 #if defined(__LP64__)
 #define	NULL	(0L)
 #else
 #define	NULL	0
 #endif	/* __LP64__ */
-#endif	/* _KERNEL && !__cplusplus */
 #endif	/* __GNUG__ */
+#endif	/* !__cplusplus */
 
 #endif