Patchwork [U-Boot] Fix warning: "assert" redefined

login
register
mail settings
Submitter Wolfgang Denk
Date Sept. 9, 2011, 10:38 p.m.
Message ID <1315607922-7285-1-git-send-email-wd@denx.de>
Download mbox | patch
Permalink /patch/114143/
State Accepted
Commit 5ae0dea3e8659a79d0284647341af2bfc349fecf
Headers show

Comments

Wolfgang Denk - Sept. 9, 2011, 10:38 p.m.
Commit 21726a7 "Add assert() for debug assertions" caused build
warnings for many systems:

In file included from bedbug.c:6:
/home/wd/git/u-boot/work/include/bedbug/bedbug.h:24:1: warning: "assert" redefined
In file included from bedbug.c:3:
/home/wd/git/u-boot/work/include/common.h:144:1: warning: this is the location of the previous definition
In file included from cmd_bedbug.c:10:
/home/wd/git/u-boot/work/include/bedbug/bedbug.h:24:1: warning: "assert" redefined
In file included from cmd_bedbug.c:5:
/home/wd/git/u-boot/work/include/common.h:144:1: warning: this is the location of the previous definition

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Simon Glass <sjg@chromium.org>
---
 include/bedbug/bedbug.h |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
Simon Glass - Sept. 9, 2011, 10:46 p.m.
Hi Wolfgang,

On Fri, Sep 9, 2011 at 3:38 PM, Wolfgang Denk <wd@denx.de> wrote:
> Commit 21726a7 "Add assert() for debug assertions" caused build
> warnings for many systems:
>
> In file included from bedbug.c:6:
> /home/wd/git/u-boot/work/include/bedbug/bedbug.h:24:1: warning: "assert" redefined
> In file included from bedbug.c:3:
> /home/wd/git/u-boot/work/include/common.h:144:1: warning: this is the location of the previous definition
> In file included from cmd_bedbug.c:10:
> /home/wd/git/u-boot/work/include/bedbug/bedbug.h:24:1: warning: "assert" redefined
> In file included from cmd_bedbug.c:5:
> /home/wd/git/u-boot/work/include/common.h:144:1: warning: this is the location of the previous definition
>

I was wondering about that one :-) Thank you. I also ignored ubifs
since it seemed to have its own system, and one in yaffs which was
commented out. If it helps:

Acked-by: Simon Glass <sjg@chromium.org>

Regards,
Simon

> Signed-off-by: Wolfgang Denk <wd@denx.de>
> Cc: Simon Glass <sjg@chromium.org>
> ---
>  include/bedbug/bedbug.h |    2 --
>  1 files changed, 0 insertions(+), 2 deletions(-)
>
> diff --git a/include/bedbug/bedbug.h b/include/bedbug/bedbug.h
> index 471215e..0c5d687 100644
> --- a/include/bedbug/bedbug.h
> +++ b/include/bedbug/bedbug.h
> @@ -21,8 +21,6 @@
>  #endif
>  #endif
>
> -#define assert( condition ) if( (condition) ) _exit(0)
> -
>  #endif /* _BEDBUG_H */
>
>
> --
> 1.7.6
>
>
Wolfgang Denk - Sept. 10, 2011, 8:37 p.m.
Dear Wolfgang Denk,

In message <1315607922-7285-1-git-send-email-wd@denx.de> you wrote:
> Commit 21726a7 "Add assert() for debug assertions" caused build
> warnings for many systems:
> 
> In file included from bedbug.c:6:
> /home/wd/git/u-boot/work/include/bedbug/bedbug.h:24:1: warning: "assert" redefined
> In file included from bedbug.c:3:
> /home/wd/git/u-boot/work/include/common.h:144:1: warning: this is the location of the previous definition
> In file included from cmd_bedbug.c:10:
> /home/wd/git/u-boot/work/include/bedbug/bedbug.h:24:1: warning: "assert" redefined
> In file included from cmd_bedbug.c:5:
> /home/wd/git/u-boot/work/include/common.h:144:1: warning: this is the location of the previous definition
> 
> Signed-off-by: Wolfgang Denk <wd@denx.de>
> Cc: Simon Glass <sjg@chromium.org>
> ---
>  include/bedbug/bedbug.h |    2 --
>  1 files changed, 0 insertions(+), 2 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Patch

diff --git a/include/bedbug/bedbug.h b/include/bedbug/bedbug.h
index 471215e..0c5d687 100644
--- a/include/bedbug/bedbug.h
+++ b/include/bedbug/bedbug.h
@@ -21,8 +21,6 @@ 
 #endif
 #endif
 
-#define assert( condition ) if( (condition) ) _exit(0)
-
 #endif /* _BEDBUG_H */