diff options
author | Mark Adler <madler@alumni.caltech.edu> | 2011-09-09 23:23:14 -0700 |
---|---|---|
committer | Mark Adler <madler@alumni.caltech.edu> | 2011-09-09 23:23:14 -0700 |
commit | a2506218cd8c32416d0d15260834f3c23d910fc8 (patch) | |
tree | 25bbd63d92473c8ae02a27cce3fc7c04a6aba64a /zconf.h | |
parent | b97ec631c6f7dd9cff2e3caf3b38e70b006e1b2d (diff) | |
download | zlib-1.2.0.8.tar.gz zlib-1.2.0.8.tar.bz2 zlib-1.2.0.8.zip |
zlib 1.2.0.8v1.2.0.8
Diffstat (limited to 'zconf.h')
-rw-r--r-- | zconf.h | 15 |
1 files changed, 12 insertions, 3 deletions
@@ -23,6 +23,7 @@ | |||
23 | # define deflateSetDictionary z_deflateSetDictionary | 23 | # define deflateSetDictionary z_deflateSetDictionary |
24 | # define deflateCopy z_deflateCopy | 24 | # define deflateCopy z_deflateCopy |
25 | # define deflateReset z_deflateReset | 25 | # define deflateReset z_deflateReset |
26 | # define deflatePrime z_deflatePrime | ||
26 | # define deflateParams z_deflateParams | 27 | # define deflateParams z_deflateParams |
27 | # define deflateBound z_deflateBound | 28 | # define deflateBound z_deflateBound |
28 | # define inflateInit2_ z_inflateInit2_ | 29 | # define inflateInit2_ z_inflateInit2_ |
@@ -105,6 +106,10 @@ | |||
105 | # define STDC | 106 | # define STDC |
106 | #endif | 107 | #endif |
107 | 108 | ||
109 | #if defined(__OS400__) && !defined(STDC) /* iSeries (formerly AS/400). */ | ||
110 | # define STDC | ||
111 | #endif | ||
112 | |||
108 | #ifndef STDC | 113 | #ifndef STDC |
109 | # ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */ | 114 | # ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */ |
110 | # define const /* note: need a more gentle solution here */ | 115 | # define const /* note: need a more gentle solution here */ |
@@ -287,11 +292,15 @@ typedef uLong FAR uLongf; | |||
287 | # define z_off_t long | 292 | # define z_off_t long |
288 | #endif | 293 | #endif |
289 | 294 | ||
290 | #if defined(__MVS__) | 295 | #if defined(__OS400__) |
291 | #define NO_vsnprintf | 296 | #define NO_vsnprintf |
292 | #ifdef FAR | ||
293 | #undef FAR | ||
294 | #endif | 297 | #endif |
298 | |||
299 | #if defined(__MVS__) | ||
300 | # define NO_vsnprintf | ||
301 | # ifdef FAR | ||
302 | # undef FAR | ||
303 | # endif | ||
295 | #endif | 304 | #endif |
296 | 305 | ||
297 | /* MVS linker does not support external names larger than 8 bytes */ | 306 | /* MVS linker does not support external names larger than 8 bytes */ |