7bb2ea4ae5
* harbour/external/zlib/deflate.c
* harbour/external/zlib/gzread.c
* pacified warnings
* harbour/external/zlib/zutil.h
! fixed to compile with XCC
* harbour/external/zlib/zconf.h
! removed wrongly added #if 0 / #endif
* harbour/external/zlib/gzguts.h
! added missing header files to fix _ALL_ builds
* harbour/external/zlib/Makefile
* reenabled warnings - it's very danger to pacify warnings in such way
what recent ZLIB update clearly shows - it was seriously broken in all
builds due to missing header files with valid function declarations
but the problem was fully hidden because C++ mode and warnings were
disabled so no problem was reported at compile time.
Please also remember that many of Windows compilers does not fully
support pure ANSI C function declaration so this new library may
not work as expected.
* harbour/external/libhpdf/hpdfcfg.h
! removed setting for all platforms HAVE_UNISTD_H
this file was generated by autoconf on platform which has <unistd.h>
but we cannot leave it because it will break all code which uses
standard autoconf settings like HAVE_UNISTD_H and is compiled
on platform where <unistd.h> is not available
* harbour/contrib/hbmzip/ioapi.c
! fixed to include ioapi.h before any other header files - it uses
some feature macros which have to be set before including standard
C files
* harbour/contrib/hbmzip/ioapi.h
! removed from feature set macros setting of internal __USE_* ones
! do not set _LARGEFILE64_SOURCE in DOS and OS2 - macro with the same
name is used by new ZLIB 1.2.4 for explicit 64 bit gzip API.
* harbour/contrib/hbmzip/hbmzip.c
! fixed old typos in type of return value in hb_zipfileParam() and
hb_unzipfileParam()
NOTE: I haven't tested if this new mzip/zlib 64 bit file IO support
works. It's even possible that previously working code in 64 bit
platforms (except Win64 on all other 64 bit platforms 'long' is
64bit integer) stopped to work so please make real tests.
293 lines
7.2 KiB
C
293 lines
7.2 KiB
C
/* zutil.h -- internal interface and configuration of the compression library
|
|
* Copyright (C) 1995-2010 Jean-loup Gailly.
|
|
* For conditions of distribution and use, see copyright notice in zlib.h
|
|
*/
|
|
|
|
/* WARNING: this file should *not* be used by applications. It is
|
|
part of the implementation of the compression library and is
|
|
subject to change. Applications should only use zlib.h.
|
|
*/
|
|
|
|
/* @(#) $Id$ */
|
|
|
|
#ifndef ZUTIL_H
|
|
#define ZUTIL_H
|
|
|
|
#define ZLIB_INTERNAL
|
|
#include "zlib.h"
|
|
|
|
#ifdef STDC
|
|
# if !(defined(_WINCE) && defined(_MSC_VER))
|
|
# include <stddef.h>
|
|
# endif
|
|
# include <string.h>
|
|
# include <stdlib.h>
|
|
#endif
|
|
|
|
#if defined(UNDER_CE) && defined(NO_ERRNO_H)
|
|
# define zseterrno(ERR) SetLastError((DWORD)(ERR))
|
|
# define zerrno() ((int)GetLastError())
|
|
#else
|
|
# ifdef NO_ERRNO_H
|
|
extern int errno;
|
|
# else
|
|
# include <errno.h>
|
|
# endif
|
|
# define zseterrno(ERR) do { errno = (ERR); } while (0)
|
|
# define zerrno() errno
|
|
#endif
|
|
|
|
#ifndef local
|
|
# define local static
|
|
#endif
|
|
/* compile with -Dlocal if your debugger can't find static symbols */
|
|
|
|
typedef unsigned char uch;
|
|
typedef uch FAR uchf;
|
|
typedef unsigned short ush;
|
|
typedef ush FAR ushf;
|
|
typedef unsigned long ulg;
|
|
|
|
extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
|
|
/* (size given to avoid silly warnings with Visual C++) */
|
|
|
|
#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]
|
|
|
|
#define ERR_RETURN(strm,err) \
|
|
return (strm->msg = (char*)ERR_MSG(err), (err))
|
|
/* To be used only when the state is known to be valid */
|
|
|
|
/* common constants */
|
|
|
|
#ifndef DEF_WBITS
|
|
# define DEF_WBITS MAX_WBITS
|
|
#endif
|
|
/* default windowBits for decompression. MAX_WBITS is for compression only */
|
|
|
|
#if MAX_MEM_LEVEL >= 8
|
|
# define DEF_MEM_LEVEL 8
|
|
#else
|
|
# define DEF_MEM_LEVEL MAX_MEM_LEVEL
|
|
#endif
|
|
/* default memLevel */
|
|
|
|
#define STORED_BLOCK 0
|
|
#define STATIC_TREES 1
|
|
#define DYN_TREES 2
|
|
/* The three kinds of block type */
|
|
|
|
#define MIN_MATCH 3
|
|
#define MAX_MATCH 258
|
|
/* The minimum and maximum match lengths */
|
|
|
|
#define PRESET_DICT 0x20 /* preset dictionary flag in zlib header */
|
|
|
|
/* target dependencies */
|
|
|
|
#if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32))
|
|
# define OS_CODE 0x00
|
|
# if defined(__TURBOC__) || defined(__BORLANDC__)
|
|
# if (__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__))
|
|
/* Allow compilation with ANSI keywords only enabled */
|
|
void _Cdecl farfree( void *block );
|
|
void *_Cdecl farmalloc( unsigned long nbytes );
|
|
# else
|
|
# include <alloc.h>
|
|
# endif
|
|
# else /* MSC or DJGPP */
|
|
# include <malloc.h>
|
|
# endif
|
|
#endif
|
|
|
|
#ifdef AMIGA
|
|
# define OS_CODE 0x01
|
|
#endif
|
|
|
|
#if defined(VAXC) || defined(VMS)
|
|
# define OS_CODE 0x02
|
|
# define F_OPEN(name, mode) \
|
|
fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512")
|
|
#endif
|
|
|
|
#if defined(ATARI) || defined(atarist)
|
|
# define OS_CODE 0x05
|
|
#endif
|
|
|
|
#ifdef OS2
|
|
# define OS_CODE 0x06
|
|
# ifdef M_I86
|
|
# include <malloc.h>
|
|
# endif
|
|
#endif
|
|
|
|
#if defined(MACOS) || defined(TARGET_OS_MAC)
|
|
# define OS_CODE 0x07
|
|
# if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
|
|
# include <unix.h> /* for fdopen */
|
|
# else
|
|
# ifndef fdopen
|
|
# define fdopen(fd,mode) NULL /* No fdopen() */
|
|
# endif
|
|
# endif
|
|
#endif
|
|
|
|
#ifdef TOPS20
|
|
# define OS_CODE 0x0a
|
|
#endif
|
|
|
|
#ifdef WIN32
|
|
# ifndef __CYGWIN__ /* Cygwin is Unix, not Win32 */
|
|
# define OS_CODE 0x0b
|
|
# endif
|
|
#endif
|
|
|
|
#ifdef __50SERIES /* Prime/PRIMOS */
|
|
# define OS_CODE 0x0f
|
|
#endif
|
|
|
|
#if defined(_BEOS_) || defined(RISCOS)
|
|
# define fdopen(fd,mode) NULL /* No fdopen() */
|
|
#endif
|
|
|
|
#if (defined(_MSC_VER) && (_MSC_VER > 600)) && !defined __INTERIX
|
|
# if defined(_WINCE)
|
|
# define fdopen(fd,mode) NULL /* No fdopen() */
|
|
# ifndef _PTRDIFF_T_DEFINED
|
|
typedef int ptrdiff_t;
|
|
# define _PTRDIFF_T_DEFINED
|
|
# endif
|
|
# else
|
|
# if defined(__XCC__)
|
|
# define fdopen(fd,mode) NULL /* No fdopen() */
|
|
# else
|
|
# define fdopen(fd,type) _fdopen(fd,type)
|
|
# endif
|
|
# endif
|
|
#endif
|
|
|
|
#if defined(__BORLANDC__)
|
|
#pragma warn -8004
|
|
#pragma warn -8008
|
|
#pragma warn -8066
|
|
#endif
|
|
|
|
#ifdef _LARGEFILE64_SOURCE
|
|
# define z_off64_t off64_t
|
|
#else
|
|
# define z_off64_t z_off_t
|
|
#endif
|
|
|
|
/* common defaults */
|
|
|
|
#ifndef OS_CODE
|
|
# define OS_CODE 0x03 /* assume Unix */
|
|
#endif
|
|
|
|
#ifndef F_OPEN
|
|
# define F_OPEN(name, mode) fopen((name), (mode))
|
|
#endif
|
|
|
|
#ifdef _LARGEFILE64_SOURCE
|
|
# define F_OPEN64(name, mode) fopen64((name), (mode))
|
|
#else
|
|
# define F_OPEN64(name, mode) fopen((name), (mode))
|
|
#endif
|
|
|
|
/* functions */
|
|
|
|
#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550)
|
|
# ifndef HAVE_VSNPRINTF
|
|
# define HAVE_VSNPRINTF
|
|
# endif
|
|
#endif
|
|
#if defined(__CYGWIN__)
|
|
# ifndef HAVE_VSNPRINTF
|
|
# define HAVE_VSNPRINTF
|
|
# endif
|
|
#endif
|
|
#ifndef HAVE_VSNPRINTF
|
|
# ifdef MSDOS
|
|
/* vsnprintf may exist on some MS-DOS compilers (DJGPP?),
|
|
but for now we just assume it doesn't. */
|
|
# define NO_vsnprintf
|
|
# endif
|
|
# ifdef __TURBOC__
|
|
# define NO_vsnprintf
|
|
# endif
|
|
# ifdef WIN32
|
|
/* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */
|
|
# if !defined(vsnprintf) && !defined(NO_vsnprintf)
|
|
# if !defined(_MSC_VER) || \
|
|
( defined(_MSC_VER) && _MSC_VER < 1500 && !defined(__XCC__) )
|
|
# define vsnprintf _vsnprintf
|
|
# endif
|
|
# endif
|
|
# endif
|
|
# ifdef __SASC
|
|
# define NO_vsnprintf
|
|
# endif
|
|
#endif
|
|
#ifdef VMS
|
|
# define NO_vsnprintf
|
|
#endif
|
|
|
|
#if defined(pyr)
|
|
# define NO_MEMCPY
|
|
#endif
|
|
#if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__)
|
|
/* Use our own functions for small and medium model with MSC <= 5.0.
|
|
* You may have to use the same strategy for Borland C (untested).
|
|
* The __SC__ check is for Symantec.
|
|
*/
|
|
# define NO_MEMCPY
|
|
#endif
|
|
#if defined(STDC) && !defined(HAVE_MEMCPY) && !defined(NO_MEMCPY)
|
|
# define HAVE_MEMCPY
|
|
#endif
|
|
#ifdef HAVE_MEMCPY
|
|
# ifdef SMALL_MEDIUM /* MSDOS small or medium model */
|
|
# define zmemcpy _fmemcpy
|
|
# define zmemcmp _fmemcmp
|
|
# define zmemzero(dest, len) _fmemset(dest, 0, len)
|
|
# else
|
|
# define zmemcpy memcpy
|
|
# define zmemcmp memcmp
|
|
# define zmemzero(dest, len) memset(dest, 0, len)
|
|
# endif
|
|
#else
|
|
extern void zmemcpy OF((Bytef* dest, const Bytef* source, uInt len));
|
|
extern int zmemcmp OF((const Bytef* s1, const Bytef* s2, uInt len));
|
|
extern void zmemzero OF((Bytef* dest, uInt len));
|
|
#endif
|
|
|
|
/* Diagnostic functions */
|
|
#ifdef DEBUG
|
|
# include <stdio.h>
|
|
extern int z_verbose;
|
|
extern void z_error OF((char *m));
|
|
# define Assert(cond,msg) {if(!(cond)) z_error(msg);}
|
|
# define Trace(x) {if (z_verbose>=0) fprintf x ;}
|
|
# define Tracev(x) {if (z_verbose>0) fprintf x ;}
|
|
# define Tracevv(x) {if (z_verbose>1) fprintf x ;}
|
|
# define Tracec(c,x) {if (z_verbose>0 && (c)) fprintf x ;}
|
|
# define Tracecv(c,x) {if (z_verbose>1 && (c)) fprintf x ;}
|
|
#else
|
|
# define Assert(cond,msg)
|
|
# define Trace(x)
|
|
# define Tracev(x)
|
|
# define Tracevv(x)
|
|
# define Tracec(c,x)
|
|
# define Tracecv(c,x)
|
|
#endif
|
|
|
|
|
|
voidpf zcalloc OF((voidpf opaque, unsigned items, unsigned size));
|
|
void zcfree OF((voidpf opaque, voidpf ptr));
|
|
|
|
#define ZALLOC(strm, items, size) \
|
|
(*((strm)->zalloc))((strm)->opaque, (items), (size))
|
|
#define ZFREE(strm, addr) (*((strm)->zfree))((strm)->opaque, (voidpf)(addr))
|
|
#define TRY_FREE(s, p) {if (p) ZFREE(s, p);}
|
|
|
|
#endif /* ZUTIL_H */
|