From a31e091ad70915278fb15b79d6ae53ea2d44b251 Mon Sep 17 00:00:00 2001
From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Date: Sat, 4 Apr 2009 12:49:11 +0200
Subject: 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>
---
 lib_generic/crc32.c  | 2 +-
 lib_generic/gunzip.c | 2 +-
 lib_generic/zlib.c   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib_generic')

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
-- 
cgit v1.2.1