Diff
Not logged in

Differences From Artifact [d136854646]:

To Artifact [220a39342a]:


1
2

3
4
5
6

7
8
9
10
11
12
13
1

2
3
4
5

6
7
8
9
10
11
12
13

-
+



-
+







/* zutil.c -- target dependent utility functions for the compression library
 * Copyright (C) 1995-2005, 2010 Jean-loup Gailly.
 * Copyright (C) 1995-2005, 2010, 2011 Jean-loup Gailly.
 * For conditions of distribution and use, see copyright notice in zlib.h
 */

/* @(#) $Id: zutil.c,v 1.3 2010/04/20 14:50:10 nijtmans Exp $ */
/* @(#) $Id$ */

#include "zutil.h"

#ifndef NO_DUMMY_DECL
struct internal_state      {int dummy;}; /* for buggy compilers */
#endif

81
82
83
84
85
86
87
88

89
90

91
92
93
94
95
96
97
98
99
100

101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
81
82
83
84
85
86
87

88


89








90

91










92

93
94
95
96
97
98
99







-
+
-
-
+
-
-
-
-
-
-
-
-

-
+
-
-
-
-
-
-
-
-
-
-

-







#endif
#ifdef PKZIP_BUG_WORKAROUND
    flags += 1L << 20;
#endif
#ifdef FASTEST
    flags += 1L << 21;
#endif
#ifdef STDC
#ifdef Z_SOLO
#  ifdef NO_vsnprintf
        flags += 1L << 25;
    return flags;
#    ifdef HAS_vsprintf_void
        flags += 1L << 26;
#    endif
#  else
#    ifdef HAS_vsnprintf_void
        flags += 1L << 26;
#    endif
#  endif
#else
        flags += 1L << 24;
    return flags;
#  ifdef NO_snprintf
        flags += 1L << 25;
#    ifdef HAS_sprintf_void
        flags += 1L << 26;
#    endif
#  else
#    ifdef HAS_snprintf_void
        flags += 1L << 26;
#    endif
#  endif
#endif
    return flags;
}

#ifdef DEBUG

#  ifndef verbose
#    define verbose 0
#  endif
177
178
179
180
181
182
183

184
185
186
187
188
189
190
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171







+







    if (len == 0) return;
    do {
        *dest++ = 0;  /* ??? to be unrolled */
    } while (--len != 0);
}
#endif

#ifndef Z_SOLO

#ifdef SYS16BIT

#ifdef __TURBOC__
/* Turbo C in 16-bit mode */

#  define MY_ZCALLOC
312
313
314
315
316
317
318


293
294
295
296
297
298
299
300
301







+
+
    voidpf ptr;
{
    free(ptr);
    if (opaque) return; /* make compiler happy */
}

#endif /* MY_ZCALLOC */

#endif /* !Z_SOLO */