diff options
| author | Peter Wemm <peter@FreeBSD.org> | 1999-01-10 09:53:51 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 1999-01-10 09:53:51 +0000 |
| commit | 41d54c8049107c372198b9a6ed24ef5fad20afdc (patch) | |
| tree | 4a0123506eed3b25ce5224cf37f6323fefb783e7 /lib/libz/zutil.h | |
| parent | 52454dcd09b77c63cfa909d2b021b5505e5a3be9 (diff) | |
| download | src-41d54c8049107c372198b9a6ed24ef5fad20afdc.tar.gz src-41d54c8049107c372198b9a6ed24ef5fad20afdc.zip | |
Merge changes from vendor branch (1.1.1 -> 1.1.3) into mainline.
Notes
Notes:
svn path=/head/; revision=42471
Diffstat (limited to 'lib/libz/zutil.h')
| -rw-r--r-- | lib/libz/zutil.h | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/lib/libz/zutil.h b/lib/libz/zutil.h index 3843e0de9f2f..429339ff9846 100644 --- a/lib/libz/zutil.h +++ b/lib/libz/zutil.h @@ -8,7 +8,7 @@ subject to change. Applications should only use zlib.h. */ -/* $FreeBSD$ */ +/* @(#) $Id: zutil.h,v 1.1.1.3 1999/01/10 09:46:59 peter Exp $ */ #ifndef _Z_UTIL_H #define _Z_UTIL_H @@ -75,7 +75,7 @@ extern const char *z_errmsg[10]; /* indexed by 2-zlib_error */ #ifdef MSDOS # define OS_CODE 0x00 -# ifdef __TURBOC__ +# if defined(__TURBOC__) || defined(__BORLANDC__) # if(__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__)) /* Allow compilation with ANSI keywords only enabled */ void _Cdecl farfree( void *block ); @@ -112,13 +112,12 @@ extern const char *z_errmsg[10]; /* indexed by 2-zlib_error */ #if defined(MACOS) || defined(TARGET_OS_MAC) # define OS_CODE 0x07 -# ifndef fdopen -# define fdopen(fd,mode) NULL /* No fdopen() */ -# endif -#endif -#if defined(__MWERKS__) && !defined(fdopen) -# if __dest_os != __be_os && __dest_os != __win32_os -# define fdopen(fd,mode) NULL +# 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 @@ -134,7 +133,7 @@ extern const char *z_errmsg[10]; /* indexed by 2-zlib_error */ # define fdopen(fd,mode) NULL /* No fdopen() */ #endif -#if (defined(_MSC_VER) && (_MSC_VER >= 600)) +#if (defined(_MSC_VER) && (_MSC_VER > 600)) # define fdopen(fd,type) _fdopen(fd,type) #endif @@ -182,8 +181,8 @@ extern const char *z_errmsg[10]; /* indexed by 2-zlib_error */ # define zmemzero(dest, len) memset(dest, 0, len) # endif #else - extern void zmemcpy OF((Bytef* dest, Bytef* source, uInt len)); - extern int zmemcmp OF((Bytef* s1, Bytef* s2, uInt len)); + 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 |