u-boot/lib/zlib/zlib.h

/* Glue between u-boot and upstream zlib */
#ifndef __GLUE_ZLIB_H__
#define __GLUE_ZLIB_H__

#include <common.h>
#include <linux/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
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> 2011-04-08 12:23:30 +00:00			`/* Glue between u-boot and upstream zlib */`
			`#ifndef __GLUE_ZLIB_H__`
			`#define __GLUE_ZLIB_H__`

			`#include <common.h>`
Replace <compiler.h> with <linux/compiler.h> Including <linux/compiler.h> is enough for general use. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> 2014-11-26 07:00:58 +00:00			`#include <linux/compiler.h>`
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> 2011-04-08 12:23:30 +00:00			`#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`