embedaddon/sudo/zlib/zutil.h - diff

Return to zutil.h CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / sudo / zlib

Diff for /embedaddon/sudo/zlib/zutil.h between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2012/02/21 16:23:02	version 1.1.1.2, 2013/07/22 10:46:14
Line 1	Line 1
/* zutil.h -- internal interface and configuration of the compression library	/* zutil.h -- internal interface and configuration of the compression library
* Copyright (C) 1995-2010 Jean-loup Gailly.	* Copyright (C) 1995-2011 Jean-loup Gailly.
* For conditions of distribution and use, see copyright notice in zlib.h	* For conditions of distribution and use, see copyright notice in zlib.h
*/	*/

Line 21	Line 21

#include "zlib.h"	#include "zlib.h"

#ifdef STDC	#if defined(STDC) && !defined(Z_SOLO)
# if !(defined(_WIN32_WCE) && defined(_MSC_VER))	# if !(defined(_WIN32_WCE) && defined(_MSC_VER))
# include <stddef.h>	# include <stddef.h>
# endif	# endif
Line 29	Line 29
# include <stdlib.h>	# include <stdlib.h>
#endif	#endif

	#ifdef Z_SOLO
	typedef long ptrdiff_t; /* guess -- will be caught if guess is wrong */
	#endif

#ifndef local	#ifndef local
# define local static	# define local static
#endif	#endif
Line 78 extern const char * const z_errmsg[10]; /* indexed by	Line 82 extern const char * const z_errmsg[10]; /* indexed by

#if defined(MSDOS) \|\| (defined(WINDOWS) && !defined(WIN32))	#if defined(MSDOS) \|\| (defined(WINDOWS) && !defined(WIN32))
# define OS_CODE 0x00	# define OS_CODE 0x00
# if defined(__TURBOC__) \|\| defined(__BORLANDC__)	# ifndef Z_SOLO
# if (__STDC__ == 1) && (defined(__LARGE__) \|\| defined(__COMPACT__))	# if defined(__TURBOC__) \|\| defined(__BORLANDC__)
/* Allow compilation with ANSI keywords only enabled */	# if (__STDC__ == 1) && (defined(__LARGE__) \|\| defined(__COMPACT__))
void _Cdecl farfree( void *block );	/* Allow compilation with ANSI keywords only enabled */
void *_Cdecl farmalloc( unsigned long nbytes );	void _Cdecl farfree( void *block );
# else	void *_Cdecl farmalloc( unsigned long nbytes );
# include <alloc.h>	# endif
	# include <alloc.h>
	# endif
	# else /* MSC or DJGPP */
	# include <malloc.h>
# endif	# endif
# else /* MSC or DJGPP */
# include <malloc.h>
# endif	# endif
#endif	#endif

Line 107 extern const char * const z_errmsg[10]; /* indexed by	Line 113 extern const char * const z_errmsg[10]; /* indexed by

#ifdef OS2	#ifdef OS2
# define OS_CODE 0x06	# define OS_CODE 0x06
# ifdef M_I86	# if defined(M_I86) && !defined(Z_SOLO)
# include <malloc.h>	# include <malloc.h>
# endif	# endif
#endif	#endif

#if defined(MACOS) \|\| defined(TARGET_OS_MAC)	#if defined(MACOS) \|\| defined(TARGET_OS_MAC)
# define OS_CODE 0x07	# define OS_CODE 0x07
# if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os	# ifndef Z_SOLO
# include <unix.h> /* for fdopen */	# if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
# else	# include <unix.h> /* for fdopen */
# ifndef fdopen	# else
# define fdopen(fd,mode) NULL /* No fdopen() */	# endif
	# define fdopen(fd,mode) NULL /* No fdopen() */
	# endif
# endif	# endif
# endif	# endif
#endif	#endif
Line 153 extern const char * const z_errmsg[10]; /* indexed by	Line 161 extern const char * const z_errmsg[10]; /* indexed by
# endif	# endif
#endif	#endif

#if defined(__BORLANDC__)	#if defined(__BORLANDC__) && !defined(MSDOS)
#pragma warn -8004	#pragma warn -8004
#pragma warn -8008	#pragma warn -8008
#pragma warn -8066	#pragma warn -8066
#endif	#endif

/* provide prototypes for these when building zlib without LFS */	/* provide prototypes for these when building zlib without LFS */
#if !defined(_LARGEFILE64_SOURCE) \|\| _LFS64_LARGEFILE-0 == 0	#if !defined(_WIN32) && (!defined(_LARGEFILE64_SOURCE) \|\| _LFS64_LARGEFILE-0 == 0)
ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));	ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));	ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
#endif	#endif
Line 177 extern const char * const z_errmsg[10]; /* indexed by	Line 185 extern const char * const z_errmsg[10]; /* indexed by

/* functions */	/* functions */

#if defined(STDC99) \|\| (defined(__TURBOC__) && __TURBOC__ >= 0x550)	#if defined(pyr) \|\| defined(Z_SOLO)
# 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 )
# 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	# define NO_MEMCPY
#endif	#endif
#if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__)	#if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__)
Line 261 extern const char * const z_errmsg[10]; /* indexed by	Line 234 extern const char * const z_errmsg[10]; /* indexed by
# define Tracecv(c,x)	# define Tracecv(c,x)
#endif	#endif

	#ifndef Z_SOLO
voidpf ZLIB_INTERNAL zcalloc OF((voidpf opaque, unsigned items,	voidpf ZLIB_INTERNAL zcalloc OF((voidpf opaque, unsigned items,
unsigned size));	unsigned size));
void ZLIB_INTERNAL zcfree OF((voidpf opaque, voidpf ptr));	void ZLIB_INTERNAL zcfree OF((voidpf opaque, voidpf ptr));
	#endif

#define ZALLOC(strm, items, size) \	#define ZALLOC(strm, items, size) \
(*((strm)->zalloc))((strm)->opaque, (items), (size))	(*((strm)->zalloc))((strm)->opaque, (items), (size))

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.1.1.1
changed lines
	Added in v.1.1.1.2