summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2009-04-04 12:49:11 +0200
committerWolfgang Denk <wd@denx.de>2009-04-04 15:37:54 +0200
commita31e091ad70915278fb15b79d6ae53ea2d44b251 (patch)
tree9019ccfe469f9f9e9b7eb4e0ec76031322bb00d5
parentae644c178f097874a92a6d934f364985fc7e075a (diff)
downloadtalos-obmc-uboot-a31e091ad70915278fb15b79d6ae53ea2d44b251.tar.gz
talos-obmc-uboot-a31e091ad70915278fb15b79d6ae53ea2d44b251.zip
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.c2
-rw-r--r--fs/cramfs/uncompress.c2
-rw-r--r--include/u-boot/zlib.h (renamed from include/zlib.h)0
-rw-r--r--lib_arm/bootm.c2
-rw-r--r--lib_avr32/bootm.c2
-rw-r--r--lib_generic/crc32.c2
-rw-r--r--lib_generic/gunzip.c2
-rw-r--r--lib_generic/zlib.c2
-rw-r--r--lib_i386/bootm.c2
-rwxr-xr-xlib_m68k/bootm.c2
-rw-r--r--lib_microblaze/bootm.c2
-rw-r--r--lib_mips/bootm.c2
-rw-r--r--lib_ppc/bootm.c2
13 files changed, 12 insertions, 12 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 6fdeef49a3..bd1813ad42 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 39dd2751be..228fe68c11 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 e441494d0d..e441494d0d 100644
--- a/include/zlib.h
+++ b/include/u-boot/zlib.h
diff --git a/lib_arm/bootm.c b/lib_arm/bootm.c
index 7dbde7df5c..128b7e313c 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 0ca4718c88..6a3172a9a0 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 b6a7a91620..3927ce13c2 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 5bcf5b7b24..01a4031a64 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 2b01c8f87d..d1cd44c436 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 ea19b3de93..f96d7bd6da 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 958c5ce014..e5ed6eb7cc 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 e97aae6881..bce4774fe3 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 3db22eafd4..54af24cba3 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 e03d763907..0d702bf251 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>
OpenPOWER on IntegriCloud