diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2011-04-08 12:23:30 +0000 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-04-30 20:21:45 +0200 |
| commit | e89516f031dbf711b71e6ee4d131cdc8b9946fb0 (patch) | |
| tree | cb36d506165e971849cc1237565798fcc236af0b /lib/zlib/zlib.h | |
| parent | 56c1769806a437c994355422f5b52ca3eee70834 (diff) | |
| download | blackbird-obmc-uboot-e89516f031dbf711b71e6ee4d131cdc8b9946fb0.tar.gz blackbird-obmc-uboot-e89516f031dbf711b71e6ee4d131cdc8b9946fb0.zip | |
zlib: split up to match original source tree
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@gentoo.org>
Diffstat (limited to 'lib/zlib/zlib.h')
| -rw-r--r-- | lib/zlib/zlib.h | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/lib/zlib/zlib.h b/lib/zlib/zlib.h new file mode 100644 index 0000000000..556be32754 --- /dev/null +++ b/lib/zlib/zlib.h @@ -0,0 +1,20 @@ +/* Glue between u-boot and upstream zlib */ +#ifndef __GLUE_ZLIB_H__ +#define __GLUE_ZLIB_H__ + +#include <common.h> +#include <compiler.h> +#include <asm/unaligned.h> +#include <watchdog.h> +#include "u-boot/zlib.h" + +/* avoid conflicts */ +#undef OFF +#undef ASMINF +#undef POSTINC +#undef NO_GZIP +#define GUNZIP +#undef STDC +#undef NO_ERRNO_H + +#endif |
