phone-side
/
uboot-mt623x
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Jean-Christophe PLAGNIOL-VILLARD 2009-04-04 12:49:11 +02:00 committed by Wolfgang Denk
parent ae644c178f
commit a31e091ad7
13 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/cmd_bootm.c
View File

@ -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>

2
fs/cramfs/uncompress.c
View File

@ -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;

0
include/zlib.h → include/u-boot/zlib.h
View File

2
lib_arm/bootm.c
View File

@ -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;

2
lib_avr32/bootm.c
View File

@ -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>

2
lib_generic/crc32.c
View File

@ -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 */

2
lib_generic/gunzip.c
View File

@ -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

2
lib_generic/zlib.c
View File

@ -27,7 +27,7 @@
#define _Z_UTIL_H
#include "zlib.h"
#include "u-boot/zlib.h"
#ifndef local
# define local static

2
lib_i386/bootm.c
View File

@ -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>

2
lib_m68k/bootm.c
View File

@ -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>

2
lib_microblaze/bootm.c
View File

@ -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;

2
lib_mips/bootm.c
View File

@ -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>

2
lib_ppc/bootm.c
View File

@ -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>