2c2
< * Copyright (C) 1995-1996 Jean-loup Gailly.
---
> * Copyright (C) 1995-1998 Jean-loup Gailly.
11c11
< /* $FreeBSD: head/lib/libz/zutil.h 21673 1997-01-14 07:20:47Z jkh $ */
---
> /* $FreeBSD: head/lib/libz/zutil.h 33908 1998-02-28 06:08:17Z steve $ */
18,23d17
< #if defined(MSDOS)||defined(VMS)||defined(CRAY)||defined(WIN32)||defined(RISCOS)
< # include <stddef.h>
< # include <errno.h>
< #else
< extern int errno;
< #endif
24a19
> # include <stddef.h>
27a23,27
> #ifdef NO_ERRNO_H
> extern int errno;
> #else
> # include <errno.h>
> #endif
79c79,85
< # include <alloc.h>
---
> # 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
95c101
< # define FOPEN(name, mode) \
---
> # define F_OPEN(name, mode) \
107c113
< #ifdef MACOS
---
> #if defined(MACOS) || defined(TARGET_OS_MAC)
108a115,117
> # ifndef fdopen
> # define fdopen(fd,mode) NULL /* No fdopen() */
> # endif
109a119,123
> #if defined(__MWERKS__) && !defined(fdopen)
> # if __dest_os != __be_os && __dest_os != __win32_os
> # define fdopen(fd,mode) NULL
> # endif
> #endif
122a137,141
> #if (defined(_MSC_VER) && (_MSC_VER >= 600))
> # define fdopen(fd,type) _fdopen(fd,type)
> #endif
>
>
129,130c148,149
< #ifndef FOPEN
< # define FOPEN(name, mode) fopen((name), (mode))
---
> #ifndef F_OPEN
> # define F_OPEN(name, mode) fopen((name), (mode))
145c164
< #if (defined(M_I86SM) || defined(M_I86MM)) && !defined(_MSC_VER)
---
> #if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__)
147a167
> * The __SC__ check is for Symantec.
173,175c193
< # ifndef verbose
< # define verbose 0
< # endif
---
> extern int z_verbose;
178,182c196,200
< # define Trace(x) fprintf x
< # define Tracev(x) {if (verbose) fprintf x ;}
< # define Tracevv(x) {if (verbose>1) fprintf x ;}
< # define Tracec(c,x) {if (verbose && (c)) fprintf x ;}
< # define Tracecv(c,x) {if (verbose>1 && (c)) fprintf x ;}
---
> # 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 ;}
193,194c211,212
< typedef uLong (*check_func) OF((uLong check, const Bytef *buf, uInt len));
<
---
> typedef uLong (ZEXPORT *check_func) OF((uLong check, const Bytef *buf,
> uInt len));