Index: _null.h
===================================================================
--- _null.h	(revision 191987)
+++ _null.h	(working copy)
@@ -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