aboutsummaryrefslogtreecommitdiff
path: root/zconf.h.cmakein
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.cmakein
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.cmakein')
-rw-r--r--zconf.h.cmakein10
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 @@
63# define gzdopen z_gzdopen 63# define gzdopen z_gzdopen
64# define gzeof z_gzeof 64# define gzeof z_gzeof
65# define gzerror z_gzerror 65# define gzerror z_gzerror
66# define gzflags z_gzflags
66# define gzflush z_gzflush 67# define gzflush z_gzflush
67# define gzgetc z_gzgetc 68# define gzgetc z_gzgetc
69# define gzgetc_ z_gzgetc_
68# define gzgets z_gzgets 70# define gzgets z_gzgets
69# define gzoffset z_gzoffset 71# define gzoffset z_gzoffset
70# define gzoffset64 z_gzoffset64 72# define gzoffset64 z_gzoffset64
@@ -424,14 +426,6 @@ typedef uLong FAR uLongf;
424#endif 426#endif
425#endif 427#endif
426 428
427#if defined(__OS400__)
428# define NO_vsnprintf
429#endif
430
431#if defined(__MVS__)
432# define NO_vsnprintf
433#endif
434
435/* MVS linker does not support external names larger than 8 bytes */ 429/* MVS linker does not support external names larger than 8 bytes */
436#if defined(__MVS__) 430#if defined(__MVS__)
437 #pragma map(deflateInit_,"DEIN") 431 #pragma map(deflateInit_,"DEIN")