Commit 79c269f3 authored by Dave Jones's avatar Dave Jones Committed by Linus Torvalds

[PATCH] remove duplicate zconf.h

Change to use the new include/linux/zconf.h
parent 238be91a
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#ifndef _INFUTIL_H #ifndef _INFUTIL_H
#define _INFUTIL_H #define _INFUTIL_H
#include "zconf.h" #include <linux/zconf.h>
#include "inftrees.h" #include "inftrees.h"
#include "infcodes.h" #include "infcodes.h"
......
/* zconf.h -- configuration of the zlib compression library
* Copyright (C) 1995-1998 Jean-loup Gailly.
* For conditions of distribution and use, see copyright notice in zlib.h
*/
/* @(#) $Id$ */
#ifndef _ZCONF_H
#define _ZCONF_H
#if defined(__GNUC__) || defined(__386__) || defined(i386)
# ifndef __32BIT__
# define __32BIT__
# endif
#endif
#if defined(__STDC__) || defined(__cplusplus)
# ifndef STDC
# define STDC
# endif
#endif
/* The memory requirements for deflate are (in bytes):
(1 << (windowBits+2)) + (1 << (memLevel+9))
that is: 128K for windowBits=15 + 128K for memLevel = 8 (default values)
plus a few kilobytes for small objects. For example, if you want to reduce
the default memory requirements from 256K to 128K, compile with
make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
Of course this will generally degrade compression (there's no free lunch).
The memory requirements for inflate are (in bytes) 1 << windowBits
that is, 32K for windowBits=15 (default value) plus a few kilobytes
for small objects.
*/
/* Maximum value for memLevel in deflateInit2 */
#ifndef MAX_MEM_LEVEL
# define MAX_MEM_LEVEL 9
#endif
/* Maximum value for windowBits in deflateInit2 and inflateInit2.
* WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
* created by gzip. (Files created by minigzip can still be extracted by
* gzip.)
*/
#ifndef MAX_WBITS
# define MAX_WBITS 15 /* 32K LZ77 window */
#endif
/* Type declarations */
#ifndef OF /* function prototypes */
# ifdef STDC
# define OF(args) args
# else
# define OF(args) ()
# endif
#endif
#ifndef ZEXPORT
# define ZEXPORT
#endif
#ifndef ZEXPORTVA
# define ZEXPORTVA
#endif
#ifndef ZEXTERN
# define ZEXTERN extern
#endif
#ifndef FAR
# define FAR
#endif
typedef unsigned char Byte; /* 8 bits */
typedef unsigned int uInt; /* 16 bits or more */
typedef unsigned long uLong; /* 32 bits or more */
typedef Byte FAR Bytef;
typedef char FAR charf;
typedef int FAR intf;
typedef uInt FAR uIntf;
typedef uLong FAR uLongf;
typedef void FAR *voidpf;
typedef void *voidp;
#include <linux/types.h> /* for off_t */
#include <linux/unistd.h> /* for SEEK_* and off_t */
#define z_off_t off_t
#endif /* _ZCONF_H */
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#ifndef _INFUTIL_H #ifndef _INFUTIL_H
#define _INFUTIL_H #define _INFUTIL_H
#include "zconf.h" #include <linux/zconf.h>
#include "inftrees.h" #include "inftrees.h"
#include "infcodes.h" #include "infcodes.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment