From 96e2b6caa5c52daade79635270ce96ce764fcd31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Wed, 21 Mar 2012 19:32:02 +0100 Subject: [PATCH] do not redefine userspace's NULL #define MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- 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 -#undef NULL +#ifndef NULL #if defined(__cplusplus) #define NULL 0 #else #define NULL ((void *)0) #endif +#endif #ifdef __KERNEL__ -- 1.7.7