Deleted Added
sdiff udiff text old ( 180208 ) new ( 205471 )
full compact
zutil.h (180208) zutil.h (205471)
1/* zutil.h -- internal interface and configuration of the compression library
1/* zutil.h -- internal interface and configuration of the compression library
2 * Copyright (C) 1995-2005 Jean-loup Gailly.
2 * Copyright (C) 1995-2010 Jean-loup Gailly.
3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */
5
6/* WARNING: this file should *not* be used by applications. It is
7 part of the implementation of the compression library and is
8 subject to change. Applications should only use zlib.h.
9 */
10
11/* @(#) $Id$ */
12
13#ifndef ZUTIL_H
14#define ZUTIL_H
15
16#define ZLIB_INTERNAL
17#include "zlib.h"
18
19#ifdef STDC
3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */
5
6/* WARNING: this file should *not* be used by applications. It is
7 part of the implementation of the compression library and is
8 subject to change. Applications should only use zlib.h.
9 */
10
11/* @(#) $Id$ */
12
13#ifndef ZUTIL_H
14#define ZUTIL_H
15
16#define ZLIB_INTERNAL
17#include "zlib.h"
18
19#ifdef STDC
20# ifndef _WIN32_WCE
20# if !(defined(_WIN32_WCE) && defined(_MSC_VER))
21# include <stddef.h>
22# endif
23# include <string.h>
24# include <stdlib.h>
25#endif
21# include <stddef.h>
22# endif
23# include <string.h>
24# include <stdlib.h>
25#endif
26#ifdef NO_ERRNO_H
27# ifdef _WIN32_WCE
28 /* The Microsoft C Run-Time Library for Windows CE doesn't have
29 * errno. We define it as a global variable to simplify porting.
30 * Its value is always 0 and should not be used. We rename it to
31 * avoid conflict with other libraries that use the same workaround.
32 */
33# define errno z_errno
34# endif
35 extern int errno;
26
27#if defined(UNDER_CE) && defined(NO_ERRNO_H)
28# define zseterrno(ERR) SetLastError((DWORD)(ERR))
29# define zerrno() ((int)GetLastError())
36#else
30#else
37# ifndef _WIN32_WCE
31# ifdef NO_ERRNO_H
32 extern int errno;
33# else
38# include <errno.h>
39# endif
34# include <errno.h>
35# endif
36# define zseterrno(ERR) do { errno = (ERR); } while (0)
37# define zerrno() errno
40#endif
41
42#ifndef local
43# define local static
44#endif
45/* compile with -Dlocal if your debugger can't find static symbols */
46
47typedef unsigned char uch;

--- 36 unchanged lines hidden (view full) ---

84
85#define PRESET_DICT 0x20 /* preset dictionary flag in zlib header */
86
87 /* target dependencies */
88
89#if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32))
90# define OS_CODE 0x00
91# if defined(__TURBOC__) || defined(__BORLANDC__)
38#endif
39
40#ifndef local
41# define local static
42#endif
43/* compile with -Dlocal if your debugger can't find static symbols */
44
45typedef unsigned char uch;

--- 36 unchanged lines hidden (view full) ---

82
83#define PRESET_DICT 0x20 /* preset dictionary flag in zlib header */
84
85 /* target dependencies */
86
87#if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32))
88# define OS_CODE 0x00
89# if defined(__TURBOC__) || defined(__BORLANDC__)
92# if(__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__))
90# if (__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__))
93 /* Allow compilation with ANSI keywords only enabled */
94 void _Cdecl farfree( void *block );
95 void *_Cdecl farmalloc( unsigned long nbytes );
96# else
97# include <alloc.h>
98# endif
99# else /* MSC or DJGPP */
100# include <malloc.h>

--- 12 unchanged lines hidden (view full) ---

113
114#if defined(ATARI) || defined(atarist)
115# define OS_CODE 0x05
116#endif
117
118#ifdef OS2
119# define OS_CODE 0x06
120# ifdef M_I86
91 /* Allow compilation with ANSI keywords only enabled */
92 void _Cdecl farfree( void *block );
93 void *_Cdecl farmalloc( unsigned long nbytes );
94# else
95# include <alloc.h>
96# endif
97# else /* MSC or DJGPP */
98# include <malloc.h>

--- 12 unchanged lines hidden (view full) ---

111
112#if defined(ATARI) || defined(atarist)
113# define OS_CODE 0x05
114#endif
115
116#ifdef OS2
117# define OS_CODE 0x06
118# ifdef M_I86
121 #include <malloc.h>
119# include <malloc.h>
122# endif
123#endif
124
125#if defined(MACOS) || defined(TARGET_OS_MAC)
126# define OS_CODE 0x07
127# if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
128# include <unix.h> /* for fdopen */
129# else

--- 16 unchanged lines hidden (view full) ---

146#ifdef __50SERIES /* Prime/PRIMOS */
147# define OS_CODE 0x0f
148#endif
149
150#if defined(_BEOS_) || defined(RISCOS)
151# define fdopen(fd,mode) NULL /* No fdopen() */
152#endif
153
120# endif
121#endif
122
123#if defined(MACOS) || defined(TARGET_OS_MAC)
124# define OS_CODE 0x07
125# if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
126# include <unix.h> /* for fdopen */
127# else

--- 16 unchanged lines hidden (view full) ---

144#ifdef __50SERIES /* Prime/PRIMOS */
145# define OS_CODE 0x0f
146#endif
147
148#if defined(_BEOS_) || defined(RISCOS)
149# define fdopen(fd,mode) NULL /* No fdopen() */
150#endif
151
154#if (defined(_MSC_VER) && (_MSC_VER > 600))
152#if (defined(_MSC_VER) && (_MSC_VER > 600)) && !defined __INTERIX
155# if defined(_WIN32_WCE)
156# define fdopen(fd,mode) NULL /* No fdopen() */
157# ifndef _PTRDIFF_T_DEFINED
158 typedef int ptrdiff_t;
159# define _PTRDIFF_T_DEFINED
160# endif
161# else
162# define fdopen(fd,type) _fdopen(fd,type)
163# endif
164#endif
165
153# if defined(_WIN32_WCE)
154# define fdopen(fd,mode) NULL /* No fdopen() */
155# ifndef _PTRDIFF_T_DEFINED
156 typedef int ptrdiff_t;
157# define _PTRDIFF_T_DEFINED
158# endif
159# else
160# define fdopen(fd,type) _fdopen(fd,type)
161# endif
162#endif
163
164#if defined(__BORLANDC__)
165 #pragma warn -8004
166 #pragma warn -8008
167 #pragma warn -8066
168#endif
169
170#ifdef _LARGEFILE64_SOURCE
171# define z_off64_t off64_t
172#else
173# define z_off64_t z_off_t
174#endif
175
166 /* common defaults */
167
168#ifndef OS_CODE
169# define OS_CODE 0x03 /* assume Unix */
170#endif
171
172#ifndef F_OPEN
173# define F_OPEN(name, mode) fopen((name), (mode))
174#endif
175
176 /* common defaults */
177
178#ifndef OS_CODE
179# define OS_CODE 0x03 /* assume Unix */
180#endif
181
182#ifndef F_OPEN
183# define F_OPEN(name, mode) fopen((name), (mode))
184#endif
185
186#ifdef _LARGEFILE64_SOURCE
187# define F_OPEN64(name, mode) fopen64((name), (mode))
188#else
189# define F_OPEN64(name, mode) fopen((name), (mode))
190#endif
191
176 /* functions */
177
178#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550)
179# ifndef HAVE_VSNPRINTF
180# define HAVE_VSNPRINTF
181# endif
182#endif
183#if defined(__CYGWIN__)

--- 8 unchanged lines hidden (view full) ---

192# define NO_vsnprintf
193# endif
194# ifdef __TURBOC__
195# define NO_vsnprintf
196# endif
197# ifdef WIN32
198 /* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */
199# if !defined(vsnprintf) && !defined(NO_vsnprintf)
192 /* functions */
193
194#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550)
195# ifndef HAVE_VSNPRINTF
196# define HAVE_VSNPRINTF
197# endif
198#endif
199#if defined(__CYGWIN__)

--- 8 unchanged lines hidden (view full) ---

208# define NO_vsnprintf
209# endif
210# ifdef __TURBOC__
211# define NO_vsnprintf
212# endif
213# ifdef WIN32
214 /* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */
215# if !defined(vsnprintf) && !defined(NO_vsnprintf)
200# define vsnprintf _vsnprintf
216# if !defined(_MSC_VER) || ( defined(_MSC_VER) && _MSC_VER < 1500 )
217# define vsnprintf _vsnprintf
218# endif
201# endif
202# endif
203# ifdef __SASC
204# define NO_vsnprintf
205# endif
206#endif
207#ifdef VMS
208# define NO_vsnprintf

--- 61 unchanged lines hidden --- 		219# endif
220# endif
221# ifdef __SASC
222# define NO_vsnprintf
223# endif
224#endif
225#ifdef VMS
226# define NO_vsnprintf

--- 61 unchanged lines hidden ---