From: Lubos Lunak <l.lunak@suse.cz>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
linux-kernel@vger.kernel.org, Arnd Bergmann <arnd@arndb.de>
Subject: [PATCH][RESEND] do not redefine userspace's NULL #define
Date: Fri, 13 Apr 2012 21:24:20 +0200 [thread overview]
Message-ID: <201204132124.21294.l.lunak@suse.cz> (raw)
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
next reply other threads:[~2012-04-13 19:24 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-13 19:24 Lubos Lunak [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201204132124.21294.l.lunak@suse.cz \
--to=l.lunak@suse.cz \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®