diff options
author | Mark Adler <madler@alumni.caltech.edu> | 2013-04-28 17:21:50 -0700 |
---|---|---|
committer | Mark Adler <madler@alumni.caltech.edu> | 2013-04-28 17:22:27 -0700 |
commit | 5b5da45640eb33d0d102c0ce5f6967ca3d727dd7 (patch) | |
tree | 8a121365267980bdda1c6247ffb815d04fb0a6e5 | |
parent | 2dad5389af478ae7d09f4479650c1471dc13e0f5 (diff) | |
download | zlib-5b5da45640eb33d0d102c0ce5f6967ca3d727dd7.tar.gz zlib-5b5da45640eb33d0d102c0ce5f6967ca3d727dd7.tar.bz2 zlib-5b5da45640eb33d0d102c0ce5f6967ca3d727dd7.zip |
Fix mixed line endings in contrib/vstudio.
-rw-r--r-- | contrib/vstudio/readme.txt | 10 | ||||
-rw-r--r-- | contrib/vstudio/vc10/zlibvc.def | 14 | ||||
-rw-r--r-- | contrib/vstudio/vc11/zlibvc.def | 14 | ||||
-rw-r--r-- | contrib/vstudio/vc9/zlibvc.def | 16 |
4 files changed, 27 insertions, 27 deletions
diff --git a/contrib/vstudio/readme.txt b/contrib/vstudio/readme.txt index 3347d8c..bfdcd9d 100644 --- a/contrib/vstudio/readme.txt +++ b/contrib/vstudio/readme.txt | |||
@@ -28,11 +28,11 @@ Build instructions for Visual Studio 2010 (32 bits or 64 bits) | |||
28 | - Uncompress current zlib, including all contrib/* files | 28 | - Uncompress current zlib, including all contrib/* files |
29 | - Open contrib\vstudio\vc10\zlibvc.sln with Microsoft Visual C++ 2010 | 29 | - Open contrib\vstudio\vc10\zlibvc.sln with Microsoft Visual C++ 2010 |
30 | 30 | ||
31 | Build instructions for Visual Studio 2012 (32 bits or 64 bits) | 31 | Build instructions for Visual Studio 2012 (32 bits or 64 bits) |
32 | -------------------------------------------------------------- | 32 | -------------------------------------------------------------- |
33 | - Uncompress current zlib, including all contrib/* files | 33 | - Uncompress current zlib, including all contrib/* files |
34 | - Open contrib\vstudio\vc11\zlibvc.sln with Microsoft Visual C++ 2012 | 34 | - Open contrib\vstudio\vc11\zlibvc.sln with Microsoft Visual C++ 2012 |
35 | 35 | ||
36 | 36 | ||
37 | Important | 37 | Important |
38 | --------- | 38 | --------- |
diff --git a/contrib/vstudio/vc10/zlibvc.def b/contrib/vstudio/vc10/zlibvc.def index 40aac1a..6367046 100644 --- a/contrib/vstudio/vc10/zlibvc.def +++ b/contrib/vstudio/vc10/zlibvc.def | |||
@@ -134,10 +134,10 @@ EXPORTS | |||
134 | gzgetc_ @161 | 134 | gzgetc_ @161 |
135 | inflateResetKeep @163 | 135 | inflateResetKeep @163 |
136 | deflateResetKeep @164 | 136 | deflateResetKeep @164 |
137 | 137 | ||
138 | ; zlib1 v1.2.7 added: | 138 | ; zlib1 v1.2.7 added: |
139 | gzopen_w @165 | 139 | gzopen_w @165 |
140 | 140 | ||
141 | ; zlib1 v1.2.8 added: | 141 | ; zlib1 v1.2.8 added: |
142 | inflateGetDictionary @166 | 142 | inflateGetDictionary @166 |
143 | gzvprintf @167 | 143 | gzvprintf @167 |
diff --git a/contrib/vstudio/vc11/zlibvc.def b/contrib/vstudio/vc11/zlibvc.def index 40aac1a..6367046 100644 --- a/contrib/vstudio/vc11/zlibvc.def +++ b/contrib/vstudio/vc11/zlibvc.def | |||
@@ -134,10 +134,10 @@ EXPORTS | |||
134 | gzgetc_ @161 | 134 | gzgetc_ @161 |
135 | inflateResetKeep @163 | 135 | inflateResetKeep @163 |
136 | deflateResetKeep @164 | 136 | deflateResetKeep @164 |
137 | 137 | ||
138 | ; zlib1 v1.2.7 added: | 138 | ; zlib1 v1.2.7 added: |
139 | gzopen_w @165 | 139 | gzopen_w @165 |
140 | 140 | ||
141 | ; zlib1 v1.2.8 added: | 141 | ; zlib1 v1.2.8 added: |
142 | inflateGetDictionary @166 | 142 | inflateGetDictionary @166 |
143 | gzvprintf @167 | 143 | gzvprintf @167 |
diff --git a/contrib/vstudio/vc9/zlibvc.def b/contrib/vstudio/vc9/zlibvc.def index 1192c53..6367046 100644 --- a/contrib/vstudio/vc9/zlibvc.def +++ b/contrib/vstudio/vc9/zlibvc.def | |||
@@ -133,11 +133,11 @@ EXPORTS | |||
133 | ; zlib1 v1.2.6 added: | 133 | ; zlib1 v1.2.6 added: |
134 | gzgetc_ @161 | 134 | gzgetc_ @161 |
135 | inflateResetKeep @163 | 135 | inflateResetKeep @163 |
136 | deflateResetKeep @164 | 136 | deflateResetKeep @164 |
137 | 137 | ||
138 | ; zlib1 v1.2.7 added: | 138 | ; zlib1 v1.2.7 added: |
139 | gzopen_w @165 | 139 | gzopen_w @165 |
140 | 140 | ||
141 | ; zlib1 v1.2.8 added: | 141 | ; zlib1 v1.2.8 added: |
142 | inflateGetDictionary @166 | 142 | inflateGetDictionary @166 |
143 | gzvprintf @167 | 143 | gzvprintf @167 |