| Message ID | 1293130396-6006-1-git-send-email-wd@denx.de |
|---|---|
| State | Superseded |
| Headers | show |
On Thursday, December 23, 2010 13:53:16 Wolfgang Denk wrote: > Commit 882b7d7 "do_reset: unify duplicate prototypes" introduced build > problems like this: > > libgenwrap.c:85: error: conflicting types for 'do_reset' > /home/wd/git/u-boot/work/include/command.h:102: error: previous declaration > of 'do_reset' was here > > Signed-off-by: Wolfgang Denk <wd@denx.de> > Cc: Mike Frysinger <vapier@gentoo.org> i wrote this patch like two weeks ago, but i guess i forgot to send it out. Signed-off-by: Mike Frysinger <vapier@gentoo.org> -mike
On Friday, December 24, 2010 13:27:25 Mike Frysinger wrote: > On Thursday, December 23, 2010 13:53:16 Wolfgang Denk wrote: > > Commit 882b7d7 "do_reset: unify duplicate prototypes" introduced build > > problems like this: > > > > libgenwrap.c:85: error: conflicting types for 'do_reset' > > /home/wd/git/u-boot/work/include/command.h:102: error: previous > > declaration of 'do_reset' was here > > > > Signed-off-by: Wolfgang Denk <wd@denx.de> > > Cc: Mike Frysinger <vapier@gentoo.org> > > i wrote this patch like two weeks ago, but i guess i forgot to send it out. nm, i did send it out: http://patchwork.ozlabs.org/patch/76159/ -mike
diff --git a/examples/api/libgenwrap.c b/examples/api/libgenwrap.c index 9733bbc..873cf34 100644 --- a/examples/api/libgenwrap.c +++ b/examples/api/libgenwrap.c @@ -81,9 +81,10 @@ void __udelay(unsigned long usec) ub_udelay(usec); } -void do_reset (void) +int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { ub_reset(); + return 0; } void *malloc (size_t len)
Commit 882b7d7 "do_reset: unify duplicate prototypes" introduced build problems like this: libgenwrap.c:85: error: conflicting types for 'do_reset' /home/wd/git/u-boot/work/include/command.h:102: error: previous declaration of 'do_reset' was here Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Mike Frysinger <vapier@gentoo.org> --- examples/api/libgenwrap.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)