Skip to contentSkip to conversation

libgenwrap.c: fix build error

PATCH New Wolfgang Denk 2 participants 3 messages Dec 23, 2010 – Dec 29, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 libgenwrap.c: fix build error

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

---
 examples/api/libgenwrap.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
examples/api/libgenwrap.c +2 -1
index 9733bbc..873cf34 100644
@@ -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)
Signature · 1 line
1.7.3.3
#1 lore raw

PATCH 1/1 libgenwrap.c: fix build error

Quoted 9 lines · 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

i wrote this patch like two weeks ago, but i guess i forgot to send it out.

-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20101224/1009928b/attachment.pgp

#2 lore raw

PATCH 1/1 libgenwrap.c: fix build error

Quoted 4 lines · On Friday, December 24, 2010 13:27:25 Mike Frysinger wrote:
Quoted 3 lines · On Thursday, December 23, 2010 13:53:16 Wolfgang Denk wrote:

Commit 882b7d7 "do_reset: unify duplicate prototypes" introduced build problems like this:

Quoted 8 lines
Quoted 6 lines

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

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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20101229/c4e33759/attachment.pgp