Message ID | 1304289062-25727-1-git-send-email-vapier@gentoo.org |
---|---|
State | Accepted |
Commit | f18185ab602b77d83610886d3a07f8eacfb12f23 |
Delegated to: | Wolfgang Denk |
Headers | show |
Dear Mike Frysinger, In message <1304289062-25727-1-git-send-email-vapier@gentoo.org> you wrote: > The previous commit imported a little too much from upstream. We need > to disable stdio.h when using U-Boot. > > Reported-by: Wolfgang Denk <wd@denx.de> > Signed-off-by: Mike Frysinger <vapier@gentoo.org> > --- > lib/zlib/zutil.h | 3 ++- > 1 files changed, 2 insertions(+), 1 deletions(-) Applied, thanks. Best regards, Wolfgang Denk
diff --git a/lib/zlib/zutil.h b/lib/zlib/zutil.h index 46522c8..114cb74 100644 --- a/lib/zlib/zutil.h +++ b/lib/zlib/zutil.h @@ -91,7 +91,8 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ /* Diagnostic functions */ #ifdef DEBUG -# include <stdio.h> +/* Not valid for U-boot +# include <stdio.h> */ extern int z_verbose; extern void z_error OF((char *m)); # define Assert(cond,msg) {if(!(cond)) z_error(msg);}
The previous commit imported a little too much from upstream. We need to disable stdio.h when using U-Boot. Reported-by: Wolfgang Denk <wd@denx.de> Signed-off-by: Mike Frysinger <vapier@gentoo.org> --- lib/zlib/zutil.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)