|
1 --- compress.c.orig 2003-07-07 07:37:56.000000000 +0200 |
|
2 +++ compress.c 2006-06-16 00:00:00.000000000 +0200 |
|
3 @@ -59,7 +59,7 @@ |
|
4 |
|
5 /* =========================================================================== |
|
6 */ |
|
7 -int ZEXPORT compress (dest, destLen, source, sourceLen) |
|
8 +int Q_ZEXPORT compress (dest, destLen, source, sourceLen) |
|
9 Bytef *dest; |
|
10 uLongf *destLen; |
|
11 const Bytef *source; |
|
12 --- gzio.c.orig 2005-07-11 22:31:48.000000000 +0200 |
|
13 +++ gzio.c 2006-08-25 00:00:00.000000000 +0200 |
|
14 @@ -205,7 +205,7 @@ |
|
15 /* =========================================================================== |
|
16 Opens a gzip (.gz) file for reading or writing. |
|
17 */ |
|
18 -gzFile ZEXPORT gzopen (path, mode) |
|
19 +gzFile Q_ZEXPORT gzopen (path, mode) |
|
20 const char *path; |
|
21 const char *mode; |
|
22 { |
|
23 @@ -391,7 +391,7 @@ |
|
24 Reads the given number of uncompressed bytes from the compressed file. |
|
25 gzread returns the number of bytes actually read (0 for end of file). |
|
26 */ |
|
27 -int ZEXPORT gzread (file, buf, len) |
|
28 +int Q_ZEXPORT gzread (file, buf, len) |
|
29 gzFile file; |
|
30 voidp buf; |
|
31 unsigned len; |
|
32 @@ -600,7 +600,7 @@ |
|
33 #ifdef STDC |
|
34 #include <stdarg.h> |
|
35 |
|
36 -int ZEXPORTVA gzprintf (gzFile file, const char *format, /* args */ ...) |
|
37 +int Q_ZEXPORT gzprintf (gzFile file, const char *format, /* args */ ...) |
|
38 { |
|
39 char buf[Z_PRINTF_BUFSIZE]; |
|
40 va_list va; |
|
41 @@ -634,7 +634,7 @@ |
|
42 } |
|
43 #else /* not ANSI C */ |
|
44 |
|
45 -int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, |
|
46 +int Q_ZEXPORT gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, |
|
47 a11, a12, a13, a14, a15, a16, a17, a18, a19, a20) |
|
48 gzFile file; |
|
49 const char *format; |
|
50 @@ -950,7 +950,7 @@ |
|
51 Flushes all pending output if necessary, closes the compressed file |
|
52 and deallocates all the (de)compression state. |
|
53 */ |
|
54 -int ZEXPORT gzclose (file) |
|
55 +int Q_ZEXPORT gzclose (file) |
|
56 gzFile file; |
|
57 { |
|
58 gz_stream *s = (gz_stream*)file; |
|
59 --- uncompr.c.orig 2003-07-07 07:36:56.000000000 +0200 |
|
60 +++ uncompr.c 2006-06-16 00:00:00.000000000 +0200 |
|
61 @@ -23,7 +23,7 @@ |
|
62 enough memory, Z_BUF_ERROR if there was not enough room in the output |
|
63 buffer, or Z_DATA_ERROR if the input data was corrupted. |
|
64 */ |
|
65 -int ZEXPORT uncompress (dest, destLen, source, sourceLen) |
|
66 +int Q_ZEXPORT uncompress (dest, destLen, source, sourceLen) |
|
67 Bytef *dest; |
|
68 uLongf *destLen; |
|
69 const Bytef *source; |
|
70 --- zlib.h.orig 2005-07-18 04:26:49.000000000 +0200 |
|
71 +++ zlib.h 2006-08-25 00:00:00.000000000 +0200 |
|
72 @@ -32,6 +32,7 @@ |
|
73 #define ZLIB_H |
|
74 |
|
75 #include "zconf.h" |
|
76 +#include "qconfig.h" |
|
77 |
|
78 #ifdef __cplusplus |
|
79 extern "C" { |
|
80 @@ -40,6 +41,19 @@ |
|
81 #define ZLIB_VERSION "1.2.3" |
|
82 #define ZLIB_VERNUM 0x1230 |
|
83 |
|
84 +#if defined(QT_VISIBILITY_AVAILABLE) |
|
85 +# define Q_ZEXPORT __attribute__((visibility("default"))) |
|
86 +#else |
|
87 +# ifdef QT_MAKEDLL |
|
88 +# define Q_ZEXPORT __declspec(dllexport) |
|
89 +# else |
|
90 +# define Q_ZEXPORT ZEXPORT |
|
91 +# endif |
|
92 +#endif |
|
93 +#ifdef Q_OS_TEMP |
|
94 +#include <qfunctions_wce.h> |
|
95 +#endif |
|
96 + |
|
97 /* |
|
98 The 'zlib' compression library provides in-memory compression and |
|
99 decompression functions, including integrity checks of the uncompressed |
|
100 @@ -209,7 +223,7 @@ |
|
101 |
|
102 /* basic functions */ |
|
103 |
|
104 -ZEXTERN const char * ZEXPORT zlibVersion OF((void)); |
|
105 +ZEXTERN Q_ZEXPORT const char * zlibVersion OF((void)); |
|
106 /* The application can compare zlibVersion and ZLIB_VERSION for consistency. |
|
107 If the first character differs, the library code actually used is |
|
108 not compatible with the zlib.h header file used by the application. |
|
109 @@ -239,7 +253,7 @@ |
|
110 */ |
|
111 |
|
112 |
|
113 -ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush)); |
|
114 +ZEXTERN int Q_ZEXPORT deflate OF((z_streamp strm, int flush)); |
|
115 /* |
|
116 deflate compresses as much data as possible, and stops when the input |
|
117 buffer becomes empty or the output buffer becomes full. It may introduce some |
|
118 @@ -325,7 +339,7 @@ |
|
119 */ |
|
120 |
|
121 |
|
122 -ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm)); |
|
123 +ZEXTERN int Q_ZEXPORT deflateEnd OF((z_streamp strm)); |
|
124 /* |
|
125 All dynamically allocated data structures for this stream are freed. |
|
126 This function discards any unprocessed input and does not flush any |
|
127 @@ -360,7 +374,7 @@ |
|
128 */ |
|
129 |
|
130 |
|
131 -ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush)); |
|
132 +ZEXTERN int Q_ZEXPORT inflate OF((z_streamp strm, int flush)); |
|
133 /* |
|
134 inflate decompresses as much data as possible, and stops when the input |
|
135 buffer becomes empty or the output buffer becomes full. It may introduce |
|
136 @@ -459,7 +473,7 @@ |
|
137 */ |
|
138 |
|
139 |
|
140 -ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm)); |
|
141 +ZEXTERN int Q_ZEXPORT inflateEnd OF((z_streamp strm)); |
|
142 /* |
|
143 All dynamically allocated data structures for this stream are freed. |
|
144 This function discards any unprocessed input and does not flush any |
|
145 @@ -535,7 +549,7 @@ |
|
146 not perform any compression: this will be done by deflate(). |
|
147 */ |
|
148 |
|
149 -ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm, |
|
150 +ZEXTERN int Q_ZEXPORT deflateSetDictionary OF((z_streamp strm, |
|
151 const Bytef *dictionary, |
|
152 uInt dictLength)); |
|
153 /* |
|
154 @@ -574,7 +588,7 @@ |
|
155 perform any compression: this will be done by deflate(). |
|
156 */ |
|
157 |
|
158 -ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest, |
|
159 +ZEXTERN int Q_ZEXPORT deflateCopy OF((z_streamp dest, |
|
160 z_streamp source)); |
|
161 /* |
|
162 Sets the destination stream as a complete copy of the source stream. |
|
163 @@ -592,7 +606,7 @@ |
|
164 destination. |
|
165 */ |
|
166 |
|
167 -ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm)); |
|
168 +ZEXTERN int Q_ZEXPORT deflateReset OF((z_streamp strm)); |
|
169 /* |
|
170 This function is equivalent to deflateEnd followed by deflateInit, |
|
171 but does not free and reallocate all the internal compression state. |
|
172 @@ -603,7 +617,7 @@ |
|
173 stream state was inconsistent (such as zalloc or state being NULL). |
|
174 */ |
|
175 |
|
176 -ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm, |
|
177 +ZEXTERN int Q_ZEXPORT deflateParams OF((z_streamp strm, |
|
178 int level, |
|
179 int strategy)); |
|
180 /* |
|
181 @@ -733,7 +747,7 @@ |
|
182 and avail_out are unchanged.) |
|
183 */ |
|
184 |
|
185 -ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm, |
|
186 +ZEXTERN int Q_ZEXPORT inflateSetDictionary OF((z_streamp strm, |
|
187 const Bytef *dictionary, |
|
188 uInt dictLength)); |
|
189 /* |
|
190 @@ -755,7 +769,7 @@ |
|
191 inflate(). |
|
192 */ |
|
193 |
|
194 -ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm)); |
|
195 +ZEXTERN int Q_ZEXPORT inflateSync OF((z_streamp strm)); |
|
196 /* |
|
197 Skips invalid compressed data until a full flush point (see above the |
|
198 description of deflate with Z_FULL_FLUSH) can be found, or until all |
|
199 @@ -786,7 +800,7 @@ |
|
200 destination. |
|
201 */ |
|
202 |
|
203 -ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm)); |
|
204 +ZEXTERN int Q_ZEXPORT inflateReset OF((z_streamp strm)); |
|
205 /* |
|
206 This function is equivalent to inflateEnd followed by inflateInit, |
|
207 but does not free and reallocate all the internal decompression state. |
|
208 @@ -1006,7 +1020,7 @@ |
|
209 utility functions can easily be modified if you need special options. |
|
210 */ |
|
211 |
|
212 -ZEXTERN int ZEXPORT compress OF((Bytef *dest, uLongf *destLen, |
|
213 +ZEXTERN int Q_ZEXPORT compress OF((Bytef *dest, uLongf *destLen, |
|
214 const Bytef *source, uLong sourceLen)); |
|
215 /* |
|
216 Compresses the source buffer into the destination buffer. sourceLen is |
|
217 @@ -1021,7 +1035,7 @@ |
|
218 buffer. |
|
219 */ |
|
220 |
|
221 -ZEXTERN int ZEXPORT compress2 OF((Bytef *dest, uLongf *destLen, |
|
222 +ZEXTERN int Q_ZEXPORT compress2 OF((Bytef *dest, uLongf *destLen, |
|
223 const Bytef *source, uLong sourceLen, |
|
224 int level)); |
|
225 /* |
|
226 @@ -1044,7 +1058,7 @@ |
|
227 a compress() or compress2() call to allocate the destination buffer. |
|
228 */ |
|
229 |
|
230 -ZEXTERN int ZEXPORT uncompress OF((Bytef *dest, uLongf *destLen, |
|
231 +ZEXTERN int Q_ZEXPORT uncompress OF((Bytef *dest, uLongf *destLen, |
|
232 const Bytef *source, uLong sourceLen)); |
|
233 /* |
|
234 Decompresses the source buffer into the destination buffer. sourceLen is |
|
235 @@ -1065,7 +1079,7 @@ |
|
236 |
|
237 typedef voidp gzFile; |
|
238 |
|
239 -ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode)); |
|
240 +ZEXTERN gzFile Q_ZEXPORT gzopen OF((const char *path, const char *mode)); |
|
241 /* |
|
242 Opens a gzip (.gz) file for reading or writing. The mode parameter |
|
243 is as in fopen ("rb" or "wb") but can also include a compression level |
|
244 @@ -1082,7 +1096,7 @@ |
|
245 can be checked to distinguish the two cases (if errno is zero, the |
|
246 zlib error is Z_MEM_ERROR). */ |
|
247 |
|
248 -ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode)); |
|
249 +ZEXTERN gzFile Q_ZEXPORT gzdopen OF((int fd, const char *mode)); |
|
250 /* |
|
251 gzdopen() associates a gzFile with the file descriptor fd. File |
|
252 descriptors are obtained from calls like open, dup, creat, pipe or |
|
253 @@ -1095,7 +1109,7 @@ |
|
254 the (de)compression state. |
|
255 */ |
|
256 |
|
257 -ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy)); |
|
258 +ZEXTERN int Q_ZEXPORT gzsetparams OF((gzFile file, int level, int strategy)); |
|
259 /* |
|
260 Dynamically update the compression level or strategy. See the description |
|
261 of deflateInit2 for the meaning of these parameters. |
|
262 @@ -1103,7 +1117,7 @@ |
|
263 opened for writing. |
|
264 */ |
|
265 |
|
266 -ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len)); |
|
267 +ZEXTERN int Q_ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len)); |
|
268 /* |
|
269 Reads the given number of uncompressed bytes from the compressed file. |
|
270 If the input file was not in gzip format, gzread copies the given number |
|
271 @@ -1111,7 +1125,7 @@ |
|
272 gzread returns the number of uncompressed bytes actually read (0 for |
|
273 end of file, -1 for error). */ |
|
274 |
|
275 -ZEXTERN int ZEXPORT gzwrite OF((gzFile file, |
|
276 +ZEXTERN int Q_ZEXPORT gzwrite OF((gzFile file, |
|
277 voidpc buf, unsigned len)); |
|
278 /* |
|
279 Writes the given number of uncompressed bytes into the compressed file. |
|
280 @@ -1119,7 +1133,7 @@ |
|
281 (0 in case of error). |
|
282 */ |
|
283 |
|
284 -ZEXTERN int ZEXPORTVA gzprintf OF((gzFile file, const char *format, ...)); |
|
285 +ZEXTERN int Q_ZEXPORT gzprintf OF((gzFile file, const char *format, ...)); |
|
286 /* |
|
287 Converts, formats, and writes the args to the compressed file under |
|
288 control of the format string, as in fprintf. gzprintf returns the number of |
|
289 @@ -1132,14 +1146,14 @@ |
|
290 because the secure snprintf() or vsnprintf() functions were not available. |
|
291 */ |
|
292 |
|
293 -ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s)); |
|
294 +ZEXTERN int Q_ZEXPORT gzputs OF((gzFile file, const char *s)); |
|
295 /* |
|
296 Writes the given null-terminated string to the compressed file, excluding |
|
297 the terminating null character. |
|
298 gzputs returns the number of characters written, or -1 in case of error. |
|
299 */ |
|
300 |
|
301 -ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len)); |
|
302 +ZEXTERN Q_ZEXPORT char * gzgets OF((gzFile file, char *buf, int len)); |
|
303 /* |
|
304 Reads bytes from the compressed file until len-1 characters are read, or |
|
305 a newline character is read and transferred to buf, or an end-of-file |
|
306 @@ -1148,13 +1162,13 @@ |
|
307 gzgets returns buf, or Z_NULL in case of error. |
|
308 */ |
|
309 |
|
310 -ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c)); |
|
311 +ZEXTERN int Q_ZEXPORT gzputc OF((gzFile file, int c)); |
|
312 /* |
|
313 Writes c, converted to an unsigned char, into the compressed file. |
|
314 gzputc returns the value that was written, or -1 in case of error. |
|
315 */ |
|
316 |
|
317 -ZEXTERN int ZEXPORT gzgetc OF((gzFile file)); |
|
318 +ZEXTERN int Q_ZEXPORT gzgetc OF((gzFile file)); |
|
319 /* |
|
320 Reads one byte from the compressed file. gzgetc returns this byte |
|
321 or -1 in case of end of file or error. |
|
322 @@ -1170,7 +1184,7 @@ |
|
323 or gzrewind(). |
|
324 */ |
|
325 |
|
326 -ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush)); |
|
327 +ZEXTERN int Q_ZEXPORT gzflush OF((gzFile file, int flush)); |
|
328 /* |
|
329 Flushes all pending output into the compressed file. The parameter |
|
330 flush is as in the deflate() function. The return value is the zlib |
|
331 @@ -1180,7 +1194,7 @@ |
|
332 degrade compression. |
|
333 */ |
|
334 |
|
335 -ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile file, |
|
336 +ZEXTERN z_off_t Q_ZEXPORT gzseek OF((gzFile file, |
|
337 z_off_t offset, int whence)); |
|
338 /* |
|
339 Sets the starting position for the next gzread or gzwrite on the |
|
340 @@ -1198,14 +1212,14 @@ |
|
341 would be before the current position. |
|
342 */ |
|
343 |
|
344 -ZEXTERN int ZEXPORT gzrewind OF((gzFile file)); |
|
345 +ZEXTERN int Q_ZEXPORT gzrewind OF((gzFile file)); |
|
346 /* |
|
347 Rewinds the given file. This function is supported only for reading. |
|
348 |
|
349 gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET) |
|
350 */ |
|
351 |
|
352 -ZEXTERN z_off_t ZEXPORT gztell OF((gzFile file)); |
|
353 +ZEXTERN z_off_t Q_ZEXPORT gztell OF((gzFile file)); |
|
354 /* |
|
355 Returns the starting position for the next gzread or gzwrite on the |
|
356 given compressed file. This position represents a number of bytes in the |
|
357 @@ -1214,7 +1228,7 @@ |
|
358 gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR) |
|
359 */ |
|
360 |
|
361 -ZEXTERN int ZEXPORT gzeof OF((gzFile file)); |
|
362 +ZEXTERN int Q_ZEXPORT gzeof OF((gzFile file)); |
|
363 /* |
|
364 Returns 1 when EOF has previously been detected reading the given |
|
365 input stream, otherwise zero. |
|
366 @@ -1226,14 +1240,14 @@ |
|
367 zero. |
|
368 */ |
|
369 |
|
370 -ZEXTERN int ZEXPORT gzclose OF((gzFile file)); |
|
371 +ZEXTERN int Q_ZEXPORT gzclose OF((gzFile file)); |
|
372 /* |
|
373 Flushes all pending output if necessary, closes the compressed file |
|
374 and deallocates all the (de)compression state. The return value is the zlib |
|
375 error number (see function gzerror below). |
|
376 */ |
|
377 |
|
378 -ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum)); |
|
379 +ZEXTERN Q_ZEXPORT const char * gzerror OF((gzFile file, int *errnum)); |
|
380 /* |
|
381 Returns the error message for the last error which occurred on the |
|
382 given compressed file. errnum is set to zlib error number. If an |
|
383 @@ -1257,7 +1271,7 @@ |
|
384 compression library. |
|
385 */ |
|
386 |
|
387 -ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len)); |
|
388 +ZEXTERN uLong Q_ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len)); |
|
389 /* |
|
390 Update a running Adler-32 checksum with the bytes buf[0..len-1] and |
|
391 return the updated checksum. If buf is NULL, this function returns |
|
392 @@ -1282,7 +1296,7 @@ |
|
393 seq1 and seq2 concatenated, requiring only adler1, adler2, and len2. |
|
394 */ |
|
395 |
|
396 -ZEXTERN uLong ZEXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len)); |
|
397 +ZEXTERN uLong Q_ZEXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len)); |
|
398 /* |
|
399 Update a running CRC-32 with the bytes buf[0..len-1] and return the |
|
400 updated CRC-32. If buf is NULL, this function returns the required initial |
|
401 @@ -1314,15 +1328,15 @@ |
|
402 /* deflateInit and inflateInit are macros to allow checking the zlib version |
|
403 * and the compiler's view of z_stream: |
|
404 */ |
|
405 -ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level, |
|
406 +ZEXTERN int Q_ZEXPORT deflateInit_ OF((z_streamp strm, int level, |
|
407 const char *version, int stream_size)); |
|
408 -ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm, |
|
409 +ZEXTERN int Q_ZEXPORT inflateInit_ OF((z_streamp strm, |
|
410 const char *version, int stream_size)); |
|
411 -ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int level, int method, |
|
412 +ZEXTERN int Q_ZEXPORT deflateInit2_ OF((z_streamp strm, int level, int method, |
|
413 int windowBits, int memLevel, |
|
414 int strategy, const char *version, |
|
415 int stream_size)); |
|
416 -ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int windowBits, |
|
417 +ZEXTERN int Q_ZEXPORT inflateInit2_ OF((z_streamp strm, int windowBits, |
|
418 const char *version, int stream_size)); |
|
419 ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits, |
|
420 unsigned char FAR *window, |
|
421 @@ -1346,9 +1360,9 @@ |
|
422 struct internal_state {int dummy;}; /* hack for buggy compilers */ |
|
423 #endif |
|
424 |
|
425 -ZEXTERN const char * ZEXPORT zError OF((int)); |
|
426 -ZEXTERN int ZEXPORT inflateSyncPoint OF((z_streamp z)); |
|
427 -ZEXTERN const uLongf * ZEXPORT get_crc_table OF((void)); |
|
428 +ZEXTERN Q_ZEXPORT const char * zError OF((int)); |
|
429 +ZEXTERN int Q_ZEXPORT inflateSyncPoint OF((z_streamp z)); |
|
430 +ZEXTERN Q_ZEXPORT const uLongf * get_crc_table OF((void)); |
|
431 |
|
432 #ifdef __cplusplus |
|
433 } |