summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLubos Lunak <l.lunak@suse.cz>2012-03-21 17:08:24 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-04-14 18:47:49 +0400
commit2084c24a81413b75bc97e4bee56b32ffece70460 (patch)
tree299c0e84719c352eea4c79db560912f858b08b33 /include
parent668ce0ac707719d866af7e432e518af7b4c575ad (diff)
downloadlinux-2084c24a81413b75bc97e4bee56b32ffece70460.tar.xz
do not export kernel's NULL #define to userspace
GCC's NULL is actually __null, which allows detecting some questionable NULL usage and warn about it. Moreover each platform/compiler should have its own stddef.h anyway (which is different from linux/stddef.h). So there's no good reason to leak kernel's NULL to userspace and override what the compiler provides. Signed-off-by: Luboš Luňák <l.lunak@suse.cz> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/stddef.h8
1 files changed, 2 insertions, 6 deletions
diff --git a/include/linux/stddef.h b/include/linux/stddef.h
index 6a40c76bdcf1..1747b6787b9e 100644
--- a/include/linux/stddef.h
+++ b/include/linux/stddef.h
@@ -3,14 +3,10 @@
#include <linux/compiler.h>
+#ifdef __KERNEL__
+
#undef NULL
-#if defined(__cplusplus)
-#define NULL 0
-#else
#define NULL ((void *)0)
-#endif
-
-#ifdef __KERNEL__
enum {
false = 0,