From e89516f031dbf711b71e6ee4d131cdc8b9946fb0 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 8 Apr 2011 12:23:30 +0000 Subject: 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 --- lib/zlib/zlib.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 lib/zlib/zlib.h (limited to 'lib/zlib/zlib.h') diff --git a/lib/zlib/zlib.h b/lib/zlib/zlib.h new file mode 100644 index 00000000000..556be327547 --- /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 +#include +#include +#include +#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 -- cgit v1.2.3