diff options
| author | Mark Adler <madler@alumni.caltech.edu> | 2011-09-09 23:33:59 -0700 |
|---|---|---|
| committer | Mark Adler <madler@alumni.caltech.edu> | 2011-09-09 23:33:59 -0700 |
| commit | a1141160bcf563f1a269be68a21f1651f687bb69 (patch) | |
| tree | 8817801b5113a40c7abceb9bfcf9fc37863d05d5 /contrib | |
| parent | 59ca2179ff8ef92e9e8351a11f1a92e7138364c2 (diff) | |
| download | zlib-a1141160bcf563f1a269be68a21f1651f687bb69.tar.gz | |
zlib 1.2.4v1.2.4
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/infback9/inftree9.c | 2 | ||||
| -rw-r--r-- | contrib/masmx64/readme.txt | 5 | ||||
| -rw-r--r-- | contrib/masmx86/readme.txt | 10 | ||||
| -rw-r--r-- | contrib/vstudio/vc10/zlibvc.def | 6 | ||||
| -rw-r--r-- | contrib/vstudio/vc9/zlibvc.def | 6 |
5 files changed, 13 insertions, 16 deletions
diff --git a/contrib/infback9/inftree9.c b/contrib/infback9/inftree9.c index 4e04db9..510bba6 100644 --- a/contrib/infback9/inftree9.c +++ b/contrib/infback9/inftree9.c @@ -64,7 +64,7 @@ unsigned short FAR *work; static const unsigned short lext[31] = { /* Length codes 257..285 extra */ 128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129, 130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132, - 133, 133, 133, 133, 144, 198, 71}; + 133, 133, 133, 133, 144, 64, 195}; static const unsigned short dbase[32] = { /* Distance codes 0..31 base */ 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073, diff --git a/contrib/masmx64/readme.txt b/contrib/masmx64/readme.txt index cd697c4..1115d9b 100644 --- a/contrib/masmx64/readme.txt +++ b/contrib/masmx64/readme.txt @@ -12,7 +12,10 @@ inffasx64.asm and inffas8664.c were written by Chris Anderson, by optimizing Use instructions
----------------
-Copy these files into the zlib source directory.
+Assemble the .asm files using MASM and put the object files into the zlib source +directory. You can also get object files here: + + http://www.winimage.com/zLibDll/zlib124_masm_obj.zip define ASMV and ASMINF in your project. Include inffas8664.c in your source tree,
and inffasx64.obj and gvmat64.obj as object to link.
diff --git a/contrib/masmx86/readme.txt b/contrib/masmx86/readme.txt index 413580e..90230f2 100644 --- a/contrib/masmx86/readme.txt +++ b/contrib/masmx86/readme.txt @@ -7,9 +7,15 @@ longest_match() and inflate_fast(). Use instructions ---------------- -Copy these files into the zlib source directory, then run the -appropriate makefile, as suggested below. +Assemble using MASM, and copy the object files into the zlib source +directory, then run the appropriate makefile, as suggested below. You can +donwload MASM from here: + http://www.microsoft.com/downloads/details.aspx?displaylang=en&FamilyID=7a1c9da0-0510-44a2-b042-7ef370530c64
+ +You can also get objects files here: + + http://www.winimage.com/zLibDll/zlib124_masm_obj.zip Build instructions ------------------ diff --git a/contrib/vstudio/vc10/zlibvc.def b/contrib/vstudio/vc10/zlibvc.def index b3b7cab..0269ef7 100644 --- a/contrib/vstudio/vc10/zlibvc.def +++ b/contrib/vstudio/vc10/zlibvc.def @@ -115,9 +115,7 @@ EXPORTS ; zlib1 v1.2.4 added:
adler32_combine @140
- adler32_combine64 @141
crc32_combine @142
- crc32_combine64 @143
deflateSetHeader @144
deflateTune @145
gzbuffer @146
@@ -125,10 +123,6 @@ EXPORTS gzclose_w @148
gzdirect @149
gzoffset @150
- gzoffset64 @151
- gzopen64 @152
- gzseek64 @153
- gztell64 @154
inflateGetHeader @156
inflateMark @157
inflatePrime @158
diff --git a/contrib/vstudio/vc9/zlibvc.def b/contrib/vstudio/vc9/zlibvc.def index b3b7cab..0269ef7 100644 --- a/contrib/vstudio/vc9/zlibvc.def +++ b/contrib/vstudio/vc9/zlibvc.def @@ -115,9 +115,7 @@ EXPORTS ; zlib1 v1.2.4 added:
adler32_combine @140
- adler32_combine64 @141
crc32_combine @142
- crc32_combine64 @143
deflateSetHeader @144
deflateTune @145
gzbuffer @146
@@ -125,10 +123,6 @@ EXPORTS gzclose_w @148
gzdirect @149
gzoffset @150
- gzoffset64 @151
- gzopen64 @152
- gzseek64 @153
- gztell64 @154
inflateGetHeader @156
inflateMark @157
inflatePrime @158
|