All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH][RESEND] do not redefine userspace's NULL #define
@ 2012-04-13 19:24 Lubos Lunak
  2012-04-13 19:39 ` Linus Torvalds
  0 siblings, 1 reply; 16+ messages in thread
From: Lubos Lunak @ 2012-04-13 19:24 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: Andrew Morton, linux-kernel, Arnd Bergmann

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 override what the compiler provides.
Keep the #define conditionally, in order to keep the headers self-contained.

Signed-off-by: Luboš Luňák <l.lunak@suse.cz>
---

 There have been no further comments after this last version, and I do not see 
how this change should affect anything in either kernel builds or userspace 
builds, except for fixing the issue of overriding the proper NULL definition, 
so I consider this the proper and safe fix.

 include/linux/stddef.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/include/linux/stddef.h b/include/linux/stddef.h
index 6a40c76..ce225a9 100644
--- a/include/linux/stddef.h
+++ b/include/linux/stddef.h
@@ -3,12 +3,13 @@
 
 #include <linux/compiler.h>
 
-#undef NULL
+#ifndef NULL
 #if defined(__cplusplus)
 #define NULL 0
 #else
 #define NULL ((void *)0)
 #endif
+#endif
 
 #ifdef __KERNEL__
 
-- 
1.7.7
-- 
 Lubos Lunak
 l.lunak@suse.cz

^ permalink raw reply related	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2012-04-16  7:44 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-04-13 19:24 [PATCH][RESEND] do not redefine userspace's NULL #define Lubos Lunak
2012-04-13 19:39 ` Linus Torvalds
2012-04-13 21:02   ` Arnd Bergmann
2012-04-16  7:43     ` Martin Schwidefsky
2012-04-13 21:46   ` Lubos Lunak
2012-04-14  8:28     ` Arnd Bergmann
2012-04-13 22:01   ` Peter Seebach
2012-04-13 22:24     ` Linus Torvalds
2012-04-13 23:18       ` Lubos Lunak
2012-04-14  0:44         ` Linus Torvalds
2012-04-14  6:43           ` Lubos Lunak
2012-04-14  7:51             ` Linus Torvalds
2012-04-14  8:21               ` Lubos Lunak
2012-04-14  8:27                 ` Linus Torvalds
2012-04-14  8:54                   ` Lubos Lunak
2012-04-14  9:30                     ` Arnd Bergmann

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.