From 67e806b2d0ec50eb6b1132ee76a31b56be291167 Mon Sep 17 00:00:00 2001 From: jhb Date: Mon, 11 May 2009 17:29:11 +0000 Subject: [PATCH] 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 --- sys/sys/_null.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/sys/_null.h b/sys/sys/_null.h index caae78133c9..b53c1b23698 100644 --- a/sys/sys/_null.h +++ b/sys/sys/_null.h @@ -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 -- 2.45.2