diff options
| author | Mark Adler <madler@alumni.caltech.edu> | 2011-10-02 11:15:00 -0700 |
|---|---|---|
| committer | Mark Adler <madler@alumni.caltech.edu> | 2011-10-02 11:15:00 -0700 |
| commit | 00c836e325a07419f5d855e2f275500a37cb27d2 (patch) | |
| tree | 1b4ef187059c19ee142f6c61952133b50a295136 /zconf.h.cmakein | |
| parent | 0956bd23dd070074ec572fd5557a74ff29797b2f (diff) | |
| download | zlib-00c836e325a07419f5d855e2f275500a37cb27d2.tar.gz | |
Merge vestigial vsnprintf determination from zutil.h to gzguts.h.
This also moves some of the same from zconf.h to gzguts.h. A new
function, gzflags(), was created to pass the compilation flags
related to vsnprintf usage back to zlibCompileFlags() in zutil.c.
In the process, various compiler configuration files were updated
to include gzflags(), as well as the new gzgetc_() function added
when the gzgetc() macro was introduced in a previous patch.
Diffstat (limited to 'zconf.h.cmakein')
| -rw-r--r-- | zconf.h.cmakein | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/zconf.h.cmakein b/zconf.h.cmakein index 0a36a72..29680aa 100644 --- a/zconf.h.cmakein +++ b/zconf.h.cmakein @@ -63,8 +63,10 @@ # define gzdopen z_gzdopen # define gzeof z_gzeof # define gzerror z_gzerror +# define gzflags z_gzflags # define gzflush z_gzflush # define gzgetc z_gzgetc +# define gzgetc_ z_gzgetc_ # define gzgets z_gzgets # define gzoffset z_gzoffset # define gzoffset64 z_gzoffset64 @@ -424,14 +426,6 @@ typedef uLong FAR uLongf; #endif #endif -#if defined(__OS400__) -# define NO_vsnprintf -#endif - -#if defined(__MVS__) -# define NO_vsnprintf -#endif - /* MVS linker does not support external names larger than 8 bytes */ #if defined(__MVS__) #pragma map(deflateInit_,"DEIN") |