author | Craig Mohrman <craig.mohrman@oracle.com> |
Fri, 05 Aug 2011 22:11:53 -0700 | |
changeset 461 | edabdd6aff23 |
permissions | -rw-r--r-- |
461
edabdd6aff23
7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
1 |
--- php-5.2.11/ext/zlib/my_zlib.h Thu Jan 25 04:13:36 2007 |
edabdd6aff23
7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
2 |
+++ php-5.2.11/ext/zlib/my_zlib.h Tue Oct 20 13:55:01 2009 |
edabdd6aff23
7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
3 |
@@ -1180,8 +1180,8 @@ |
edabdd6aff23
7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
4 |
degrade compression. |
edabdd6aff23
7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
5 |
*/ |
edabdd6aff23
7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
6 |
|
edabdd6aff23
7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
7 |
-ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile file, |
edabdd6aff23
7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
8 |
- z_off_t offset, int whence)); |
edabdd6aff23
7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
9 |
+ZEXTERN int ZEXPORT gzseek OF((gzFile file, |
edabdd6aff23
7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
10 |
+ int offset, int whence)); |
edabdd6aff23
7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
11 |
/* |
edabdd6aff23
7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
12 |
Sets the starting position for the next gzread or gzwrite on the |
edabdd6aff23
7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
13 |
given compressed file. The offset represents a number of bytes in the |
edabdd6aff23
7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
14 |
@@ -1205,7 +1205,7 @@ |
edabdd6aff23
7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
15 |
gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET) |
edabdd6aff23
7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
16 |
*/ |
edabdd6aff23
7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
17 |
|
edabdd6aff23
7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
18 |
-ZEXTERN z_off_t ZEXPORT gztell OF((gzFile file)); |
edabdd6aff23
7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
19 |
+ZEXTERN int ZEXPORT gztell OF((gzFile file)); |
edabdd6aff23
7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
20 |
/* |
edabdd6aff23
7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
21 |
Returns the starting position for the next gzread or gzwrite on the |
edabdd6aff23
7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
22 |
given compressed file. This position represents a number of bytes in the |
edabdd6aff23
7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
23 |
@@ -1274,7 +1274,7 @@ |
edabdd6aff23
7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
24 |
*/ |
edabdd6aff23
7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
25 |
|
edabdd6aff23
7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
26 |
ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2, |
edabdd6aff23
7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
27 |
- z_off_t len2)); |
edabdd6aff23
7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
28 |
+ int len2)); |
edabdd6aff23
7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
29 |
/* |
edabdd6aff23
7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
30 |
Combine two Adler-32 checksums into one. For two sequences of bytes, seq1 |
edabdd6aff23
7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
31 |
and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for |
edabdd6aff23
7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
32 |
@@ -1298,7 +1298,7 @@ |
edabdd6aff23
7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
33 |
if (crc != original_crc) error(); |
edabdd6aff23
7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
34 |
*/ |
edabdd6aff23
7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
35 |
|
edabdd6aff23
7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
36 |
-ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2)); |
edabdd6aff23
7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
37 |
+ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, int len2)); |
edabdd6aff23
7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
38 |
|
edabdd6aff23
7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
39 |
/* |
edabdd6aff23
7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
40 |
Combine two CRC-32 check values into one. For two sequences of bytes, |
edabdd6aff23
7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
41 |
--- php-5.2.11/ext/zlib/php_zlib.h.ORIG Tue Oct 20 13:56:27 2009 |
edabdd6aff23
7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
42 |
+++ php-5.2.11/ext/zlib/php_zlib.h Tue Oct 20 13:56:38 2009 |
edabdd6aff23
7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
43 |
@@ -22,7 +22,7 @@ |
edabdd6aff23
7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
44 |
#ifndef PHP_ZLIB_H |
edabdd6aff23
7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
45 |
#define PHP_ZLIB_H |
edabdd6aff23
7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
46 |
|
edabdd6aff23
7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
47 |
-#include <zlib.h> |
edabdd6aff23
7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
48 |
+#include "my_zlib.h" |
edabdd6aff23
7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
49 |
|
edabdd6aff23
7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
50 |
ZEND_BEGIN_MODULE_GLOBALS(zlib) |
edabdd6aff23
7072982 move php from sfw to userland consolidation
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
51 |
/* variables for transparent gzip encoding */ |