diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2009-04-04 12:49:11 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-04-04 15:37:54 +0200 |
| commit | a31e091ad70915278fb15b79d6ae53ea2d44b251 (patch) | |
| tree | 9019ccfe469f9f9e9b7eb4e0ec76031322bb00d5 | |
| parent | ae644c178f097874a92a6d934f364985fc7e075a (diff) | |
| download | u-boot-imx-a31e091ad70915278fb15b79d6ae53ea2d44b251.zip u-boot-imx-a31e091ad70915278fb15b79d6ae53ea2d44b251.tar.gz u-boot-imx-a31e091ad70915278fb15b79d6ae53ea2d44b251.tar.bz2 | |
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>
| -rw-r--r-- | common/cmd_bootm.c | 2 | ||||
| -rw-r--r-- | fs/cramfs/uncompress.c | 2 | ||||
| -rw-r--r-- | include/u-boot/zlib.h (renamed from include/zlib.h) | 0 | ||||
| -rw-r--r-- | lib_arm/bootm.c | 2 | ||||
| -rw-r--r-- | lib_avr32/bootm.c | 2 | ||||
| -rw-r--r-- | lib_generic/crc32.c | 2 | ||||
| -rw-r--r-- | lib_generic/gunzip.c | 2 | ||||
| -rw-r--r-- | lib_generic/zlib.c | 2 | ||||
| -rw-r--r-- | lib_i386/bootm.c | 2 | ||||
| -rwxr-xr-x | lib_m68k/bootm.c | 2 | ||||
| -rw-r--r-- | lib_microblaze/bootm.c | 2 | ||||
| -rw-r--r-- | lib_mips/bootm.c | 2 | ||||
| -rw-r--r-- | lib_ppc/bootm.c | 2 |
13 files changed, 12 insertions, 12 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 6fdeef4..bd1813a 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -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> diff --git a/fs/cramfs/uncompress.c b/fs/cramfs/uncompress.c index 39dd275..228fe68 100644 --- a/fs/cramfs/uncompress.c +++ b/fs/cramfs/uncompress.c @@ -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; diff --git a/include/zlib.h b/include/u-boot/zlib.h index e441494..e441494 100644 --- a/include/zlib.h +++ b/include/u-boot/zlib.h diff --git a/lib_arm/bootm.c b/lib_arm/bootm.c index 7dbde7d..128b7e3 100644 --- a/lib_arm/bootm.c +++ b/lib_arm/bootm.c @@ -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; diff --git a/lib_avr32/bootm.c b/lib_avr32/bootm.c index 0ca4718..6a3172a 100644 --- a/lib_avr32/bootm.c +++ b/lib_avr32/bootm.c @@ -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> diff --git a/lib_generic/crc32.c b/lib_generic/crc32.c index b6a7a91..3927ce1 100644 --- a/lib_generic/crc32.c +++ b/lib_generic/crc32.c @@ -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 */ diff --git a/lib_generic/gunzip.c b/lib_generic/gunzip.c index 5bcf5b7..01a4031 100644 --- a/lib_generic/gunzip.c +++ b/lib_generic/gunzip.c @@ -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 diff --git a/lib_generic/zlib.c b/lib_generic/zlib.c index 2b01c8f..d1cd44c 100644 --- a/lib_generic/zlib.c +++ b/lib_generic/zlib.c @@ -27,7 +27,7 @@ #define _Z_UTIL_H -#include "zlib.h" +#include "u-boot/zlib.h" #ifndef local # define local static diff --git a/lib_i386/bootm.c b/lib_i386/bootm.c index ea19b3d..f96d7bd 100644 --- a/lib_i386/bootm.c +++ b/lib_i386/bootm.c @@ -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> diff --git a/lib_m68k/bootm.c b/lib_m68k/bootm.c index 958c5ce..e5ed6eb 100755 --- a/lib_m68k/bootm.c +++ b/lib_m68k/bootm.c @@ -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> diff --git a/lib_microblaze/bootm.c b/lib_microblaze/bootm.c index e97aae6..bce4774 100644 --- a/lib_microblaze/bootm.c +++ b/lib_microblaze/bootm.c @@ -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; diff --git a/lib_mips/bootm.c b/lib_mips/bootm.c index 3db22ea..54af24c 100644 --- a/lib_mips/bootm.c +++ b/lib_mips/bootm.c @@ -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> diff --git a/lib_ppc/bootm.c b/lib_ppc/bootm.c index e03d763..0d702bf 100644 --- a/lib_ppc/bootm.c +++ b/lib_ppc/bootm.c @@ -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> |