Commit a31e091a authored by Jean-Christophe PLAGNIOL-VILLARD's avatar Jean-Christophe PLAGNIOL-VILLARD Committed by Wolfgang Denk

rename include/zlib.h to include/u-boot/zlib.h

Some systems have zlib.h installed in /usr/include/. This isn't the
desired file for u-boot code - we want the one in include/zlib.h.
This rename will avoid the conflict.
Signed-off-by: default avatarJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: default avatarMike Frysinger <vapier@gentoo.org>
parent ae644c17
......@@ -30,7 +30,7 @@
#include <command.h>
#include <image.h>
#include <malloc.h>
#include <zlib.h>
#include <u-boot/zlib.h>
#include <bzlib.h>
#include <environment.h>
#include <lmb.h>
......
......@@ -23,7 +23,7 @@
#include <common.h>
#include <malloc.h>
#include <watchdog.h>
#include <zlib.h>
#include <u-boot/zlib.h>
static z_stream stream;
......
......@@ -24,7 +24,7 @@
#include <common.h>
#include <command.h>
#include <image.h>
#include <zlib.h>
#include <u-boot/zlib.h>
#include <asm/byteorder.h>
DECLARE_GLOBAL_DATA_PTR;
......
......@@ -22,7 +22,7 @@
#include <common.h>
#include <command.h>
#include <image.h>
#include <zlib.h>
#include <u-boot/zlib.h>
#include <asm/byteorder.h>
#include <asm/arch/addrspace.h>
#include <asm/io.h>
......
......@@ -17,7 +17,7 @@
#if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)
#include <watchdog.h>
#endif
#include "zlib.h"
#include "u-boot/zlib.h"
#define local static
#define ZEXPORT /* empty */
......
......@@ -26,7 +26,7 @@
#include <command.h>
#include <image.h>
#include <malloc.h>
#include <zlib.h>
#include <u-boot/zlib.h>
#define ZALLOC_ALIGNMENT 16
#define HEAD_CRC 2
......
......@@ -27,7 +27,7 @@
#define _Z_UTIL_H
#include "zlib.h"
#include "u-boot/zlib.h"
#ifndef local
# define local static
......
......@@ -24,7 +24,7 @@
#include <common.h>
#include <command.h>
#include <image.h>
#include <zlib.h>
#include <u-boot/zlib.h>
#include <asm/byteorder.h>
#include <asm/zimage.h>
......
......@@ -24,7 +24,7 @@
#include <common.h>
#include <command.h>
#include <image.h>
#include <zlib.h>
#include <u-boot/zlib.h>
#include <bzlib.h>
#include <watchdog.h>
#include <environment.h>
......
......@@ -27,7 +27,7 @@
#include <common.h>
#include <command.h>
#include <image.h>
#include <zlib.h>
#include <u-boot/zlib.h>
#include <asm/byteorder.h>
DECLARE_GLOBAL_DATA_PTR;
......
......@@ -24,7 +24,7 @@
#include <common.h>
#include <command.h>
#include <image.h>
#include <zlib.h>
#include <u-boot/zlib.h>
#include <asm/byteorder.h>
#include <asm/addrspace.h>
......
......@@ -29,7 +29,7 @@
#include <command.h>
#include <image.h>
#include <malloc.h>
#include <zlib.h>
#include <u-boot/zlib.h>
#include <bzlib.h>
#include <environment.h>
#include <asm/byteorder.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment