From owner-svn-src-all@FreeBSD.ORG  Mon May 11 17:29:11 2009
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 5F5AE106564A;
	Mon, 11 May 2009 17:29:11 +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 4E0928FC12;
	Mon, 11 May 2009 17:29:11 +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 n4BHTBQc097558;
	Mon, 11 May 2009 17:29:11 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4BHTBRx097557;
	Mon, 11 May 2009 17:29:11 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <200905111729.n4BHTBRx097557@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Mon, 11 May 2009 17:29:11 +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: r191996 - head/sys/sys
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, 11 May 2009 17:29:11 -0000

Author: jhb
Date: Mon May 11 17:29:11 2009
New Revision: 191996
URL: http://svn.freebsd.org/changeset/base/191996

Log:
  Always use __null to define NULL for GCC 4+.  Use '0' rather than
  '(void *)0' for NULL for C++ compilers compiling kernel code.  Together this
  makes it easier to build kernel modules using C++.
  
  Reviewed by:	imp
  MFC after:	3 days

Modified:
  head/sys/sys/_null.h

Modified: head/sys/sys/_null.h
==============================================================================
--- head/sys/sys/_null.h	Mon May 11 17:13:52 2009	(r191995)
+++ head/sys/sys/_null.h	Mon May 11 17:29:11 2009	(r191996)
@@ -28,18 +28,18 @@
 
 #ifndef NULL
 
-#if defined(_KERNEL) || !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	/* _KERNEL || !__cplusplus */
 
 #endif