diff options
| author | Du Huanpeng <u74147@gmail.com> | 2016-04-13 16:04:01 +0000 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-04-14 08:00:26 +0200 |
| commit | b86834423f856aecf733ddc8c8c1fb1d075f8e6e (patch) | |
| tree | 47467d268f2a05cd7025f5d5192843d5e8de94d5 | |
| parent | d5034e62bc2bc765948c60d4a4b788458ad0fb00 (diff) | |
| download | barebox-b86834423f856aecf733ddc8c8c1fb1d075f8e6e.tar.gz barebox-b86834423f856aecf733ddc8c8c1fb1d075f8e6e.tar.xz | |
NULL: keep NULL definition in stddef.h only
remove other local definition of NULL, use
#include <linux/stddef.h>
instead.
I use this command to search NULL definition,
grep -R "define\s*\<NULL\>"
hope there are no more definition of NULL.
from ISO/IEC 9899:TC3:
The macros are
NULL
which expands to an implementation-defined null pointer constant;
Signed-off-by: Du Huanpeng <u74147@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | include/command.h | 5 | ||||
| -rw-r--r-- | lib/bzlib_private.h | 11 |
2 files changed, 2 insertions, 14 deletions
diff --git a/include/command.h b/include/command.h index 3aca1a9f1b..b938431f05 100644 --- a/include/command.h +++ b/include/command.h @@ -25,10 +25,7 @@ #include <linux/list.h> #include <linux/stringify.h> - -#ifndef NULL -#define NULL 0 -#endif +#include <linux/stddef.h> #ifndef __ASSEMBLY__ diff --git a/lib/bzlib_private.h b/lib/bzlib_private.h index 87d8f94525..de10dd4215 100644 --- a/lib/bzlib_private.h +++ b/lib/bzlib_private.h @@ -67,6 +67,7 @@ #define _BZLIB_PRIVATE_H #include <malloc.h> +#include <linux/stddef.h> #include "bzlib.h" @@ -515,16 +516,6 @@ BZ2_hbCreateDecodeTables ( Int32*, Int32*, Int32*, UChar*, #endif - -/*-- BZ_NO_STDIO seems to make NULL disappear on some platforms. --*/ - -#ifdef BZ_NO_STDIO -#ifndef NULL -#define NULL 0 -#endif -#endif - - /*-------------------------------------------------------------*/ /*--- end bzlib_private.h ---*/ /*-------------------------------------------------------------*/ |