summaryrefslogtreecommitdiff
path: root/zconf.h
diff options
context:
space:
mode:
authorMark Adler <madler@alumni.caltech.edu>2011-10-02 11:15:00 -0700
committerMark Adler <madler@alumni.caltech.edu>2011-10-02 11:15:00 -0700
commit00c836e325a07419f5d855e2f275500a37cb27d2 (patch)
tree1b4ef187059c19ee142f6c61952133b50a295136 /zconf.h
parent0956bd23dd070074ec572fd5557a74ff29797b2f (diff)
downloadzlib-00c836e325a07419f5d855e2f275500a37cb27d2.tar.gz
zlib-00c836e325a07419f5d855e2f275500a37cb27d2.tar.bz2
zlib-00c836e325a07419f5d855e2f275500a37cb27d2.zip
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')
-rw-r--r--zconf.h10
1 files changed, 2 insertions, 8 deletions
diff --git a/zconf.h b/zconf.h
index c8c2aaa..bcb7615 100644
--- a/zconf.h
+++ b/zconf.h
@@ -61,8 +61,10 @@
61# define gzdopen z_gzdopen 61# define gzdopen z_gzdopen
62# define gzeof z_gzeof 62# define gzeof z_gzeof
63# define gzerror z_gzerror 63# define gzerror z_gzerror
64# define gzflags z_gzflags
64# define gzflush z_gzflush 65# define gzflush z_gzflush
65# define gzgetc z_gzgetc 66# define gzgetc z_gzgetc
67# define gzgetc_ z_gzgetc_
66# define gzgets z_gzgets 68# define gzgets z_gzgets
67# define gzoffset z_gzoffset 69# define gzoffset z_gzoffset
68# define gzoffset64 z_gzoffset64 70# define gzoffset64 z_gzoffset64
@@ -422,14 +424,6 @@ typedef uLong FAR uLongf;
422#endif 424#endif
423#endif 425#endif
424 426
425#if defined(__OS400__)
426# define NO_vsnprintf
427#endif
428
429#if defined(__MVS__)
430# define NO_vsnprintf
431#endif
432
433/* MVS linker does not support external names larger than 8 bytes */ 427/* MVS linker does not support external names larger than 8 bytes */
434#if defined(__MVS__) 428#if defined(__MVS__)
435 #pragma map(deflateInit_,"DEIN") 429 #pragma map(deflateInit_,"DEIN")