[U-Boot] [PATCH] zlib: split up to match original source tree

[Wolfgang Denk]

Dear Mike Frysinger,

In message <1302301410-1135-1-git-send-email-vapier at gentoo.org> you wrote:
> While looking to upgrade to zlib-1.2.5, the current mondo merge of
> multiple files into a single was making things way more difficult
> than it should have been.  Hard to pick out what has been changed
> to port it to U-Boot, been removed as useless, and bug fixes added
> after the fact.
> 
> So split the single file up into the original file names, and merge
> non-essential changes back from the original tree (for some reason,
> style in code in a bunch of places was changed to U-Boot style even
> though this isn't "U-Boot" code).
> 
> The original build style is retained -- we have a single zlib.c that
> includes all the other files, and that is the only file we compile.
> 
> Signed-off-by: Mike Frysinger <vapier at gentoo.org>

This commit breaks building when DEBUG is enables, which can easily be
seen when trying to build for example the utx8245 board:

Configuring for utx8245 board...
In file included from zlib.c:15:
zutil.h:94:21: error: stdio.h: No such file or directory
make[1]: *** No rule to make target `/work/wd/tmp-ppc/lib/zlib/.depend', needed by `/work/wd/tmp-ppc/lib/zlib/libz.o'.  Stop.
make: *** [/work/wd/tmp-ppc/lib/zlib/libz.o] Error 2


The reason is that with DEBUG defined, "lib/zlib/zutil.h" attemps to
include <stdio.h> which is not correct for U-Boot:

 92 /* Diagnostic functions */
 93 #ifdef DEBUG
 94 #  include <stdio.h>
...

Please fix!

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
If a man had a child who'd gone  anti-social,  killed  perhaps,  he'd
still tend to protect that child.
	-- McCoy, "The Ultimate Computer", stardate 4731.3