From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from m50-134.163.com ([123.125.50.134]) by casper.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1aqJeU-00072C-TT for barebox@lists.infradead.org; Wed, 13 Apr 2016 12:12:13 +0000 From: Du Huanpeng Date: Wed, 13 Apr 2016 20:11:33 +0800 Message-Id: <1460549493-13044-1-git-send-email-d-hp@163.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: [PATCH] NULL: remove other definition of NULL To: barebox@lists.infradead.org Cc: Du Huanpeng From: Du Huanpeng remove other definition of NULL, use #include instead. I use this command to search NULL definition, grep -R "define\s*\" hope there are no more definition of NULL. Signed-off-by: Du Huanpeng --- include/command.h | 5 +---- lib/bzlib_private.h | 11 +---------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/include/command.h b/include/command.h index e41068a..b938431 100644 --- a/include/command.h +++ b/include/command.h @@ -25,10 +25,7 @@ #include #include - -#ifndef NULL -#define NULL ((void *)0) -#endif +#include #ifndef __ASSEMBLY__ diff --git a/lib/bzlib_private.h b/lib/bzlib_private.h index 87d8f94..de10dd4 100644 --- a/lib/bzlib_private.h +++ b/lib/bzlib_private.h @@ -67,6 +67,7 @@ #define _BZLIB_PRIVATE_H #include +#include #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 ---*/ /*-------------------------------------------------------------*/ -- 1.9.1 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox