--- _null.h	2005-01-07 03:29:23.000000000 +0100
+++ _null.h	2009-01-20 22:32:16.000000000 +0100
@@ -31,11 +31,15 @@
 #if defined(_KERNEL) || !defined(__cplusplus)
 #define	NULL	((void *)0)
 #else
+#if defined(__GNUG__) && defined(__GNUC__) && __GNUC__ >= 4
+#define	NULL	__null
+#else
 #if defined(__LP64__)
 #define	NULL	(0L)
 #else
 #define	NULL	0
 #endif	/* __LP64__ */
+#endif	/* __GNUG__ */
 #endif	/* _KERNEL || !__cplusplus */
 
 #endif