From 7662eb2b9d6fbc95ecb1fb3e5b5147215e251e7d Mon Sep 17 00:00:00 2001 From: Giuseppe CONDORELLI Date: Thu, 3 Sep 2009 07:37:46 -0400 Subject: [PATCH] zlib: fix code when DEBUG is defined Removed stdio.h inclusion and moved trace macros to use printf avoiding to write debug informations to standard error. Signed-off-by: Giuseppe Condorelli --- lib_generic/zlib.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib_generic/zlib.c b/lib_generic/zlib.c index 1b6db3214e..8fe3bd0dd1 100644 --- a/lib_generic/zlib.c +++ b/lib_generic/zlib.c @@ -27,6 +27,7 @@ #define ZLIB_INTERNAL #include "u-boot/zlib.h" +#include /* To avoid a build time warning */ #ifdef STDC #include @@ -83,10 +84,10 @@ typedef unsigned long ulg; /* Diagnostic functions */ #ifdef DEBUG -#include extern int z_verbose; extern void z_error OF((char *m)); #define Assert(cond,msg) {if(!(cond)) z_error(msg);} +#define fprintf(fp,...) printf(__VA_ARGS__) #define Trace(x) {if (z_verbose>=0) fprintf x ;} #define Tracev(x) {if (z_verbose>0) fprintf x ;} #define Tracevv(x) {if (z_verbose>1) fprintf x ;} @@ -2000,7 +2001,7 @@ void z_error (m) char *m; { fprintf(stderr, "%s\n", m); - exit(1); + hang (); } #endif -- 2.30.2