Browse Source

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>
imx_v2009.08_10.04.01
Jean-Christophe PLAGNIOL-VILLARD 12 years ago
committed by Wolfgang Denk
parent
commit
a31e091ad7
13 changed files with 12 additions and 12 deletions
  1. +1
    -1
      common/cmd_bootm.c
  2. +1
    -1
      fs/cramfs/uncompress.c
  3. +0
    -0
      include/u-boot/zlib.h
  4. +1
    -1
      lib_arm/bootm.c
  5. +1
    -1
      lib_avr32/bootm.c
  6. +1
    -1
      lib_generic/crc32.c
  7. +1
    -1
      lib_generic/gunzip.c
  8. +1
    -1
      lib_generic/zlib.c
  9. +1
    -1
      lib_i386/bootm.c
  10. +1
    -1
      lib_m68k/bootm.c
  11. +1
    -1
      lib_microblaze/bootm.c
  12. +1
    -1
      lib_mips/bootm.c
  13. +1
    -1
      lib_ppc/bootm.c

+ 1
- 1
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>


+ 1
- 1
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;


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


+ 1
- 1
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;


+ 1
- 1
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>


+ 1
- 1
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 */


+ 1
- 1
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


+ 1
- 1
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


+ 1
- 1
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>


+ 1
- 1
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>


+ 1
- 1
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;


+ 1
- 1
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>


+ 1
- 1
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>


Loading…
Cancel
Save